diff --git a/src/deh_lua.c b/src/deh_lua.c
index fc3495d06231a883ffcb389ca9c0aadac032675b..a16a74e2500a56d02b1902446eb32fece36136ff 100644
--- a/src/deh_lua.c
+++ b/src/deh_lua.c
@@ -69,13 +69,13 @@ static inline int lib_freeslot(lua_State *L)
 		else if (fastcmp(type, "S"))
 		{
 			CONS_Printf("State S_%s allocated.\n",word);
-			lua_pushinteger(L, P_AllocateState(Z_StrDup(va("S_%s", word))));
+			lua_pushinteger(L, P_AllocateState(Z_StrDup(word)));
 			r++;
 		}
 		else if (fastcmp(type, "MT"))
 		{
 			CONS_Printf("MobjType MT_%s allocated.\n",word);
-			lua_pushinteger(L, P_AllocateMobjinfo(Z_StrDup(va("MT_%s", word))));
+			lua_pushinteger(L, P_AllocateMobjinfo(Z_StrDup(word)));
 			r++;
 		}
 		else if (fastcmp(type, "SKINCOLOR"))
@@ -376,9 +376,10 @@ static int ScanConstants(lua_State *L, boolean mathlib, const char *word)
 		return 0;
 	}
 	else if (fastncmp("S_",word,2)) {
+		p = word+2;
 		for (i = 0; (UINT32)i < numstates; i++)
 		{
-			if (fastcmp(word, states[i]->name))
+			if (fastcmp(p, states[i]->name))
 			{
 				CacheAndPushConstant(L, word, i);
 				return 1;
@@ -387,9 +388,10 @@ static int ScanConstants(lua_State *L, boolean mathlib, const char *word)
 		return luaL_error(L, "state '%s' does not exist.\n", word);
 	}
 	else if (fastncmp("MT_",word,3)) {
+		p = word+3;
 		for (i = 0; (UINT32)i < nummobjinfo; i++)
 		{
-			if (fastcmp(word, mobjinfo[i]->name))
+			if (fastcmp(p, mobjinfo[i]->name))
 			{
 				CacheAndPushConstant(L, word, i);
 				return 1;
diff --git a/src/deh_soc.c b/src/deh_soc.c
index a00d2aad3ff6ffc6b4fad882b25edfbbba836525..42b2aa132b02704dcede22d43b9bacf1319ce67a 100644
--- a/src/deh_soc.c
+++ b/src/deh_soc.c
@@ -452,12 +452,12 @@ void readfreeslots(MYFILE *f)
 			else if (fastcmp(type, "S"))
 			{
 				CONS_Printf("State S_%s allocated.\n",word);
-				P_AllocateState(Z_StrDup(va("S_%s", word)));
+				P_AllocateState(Z_StrDup(word));
 			}
 			else if (fastcmp(type, "MT"))
 			{
 				CONS_Printf("MobjType MT_%s allocated.\n",word);
-				P_AllocateMobjinfo(Z_StrDup(va("MT_%s", word)));
+				P_AllocateMobjinfo(Z_StrDup(word));
 			}
 			else if (fastcmp(type, "SKINCOLOR"))
 			{
@@ -4102,7 +4102,8 @@ mobjtype_t get_mobjtype(const char *word)
 	UINT32 i;
 	if (*word >= '0' && *word <= '9')
 		return atoi(word);
-	I_Assert(fastncmp("MT_",word,3));
+	if (fastncmp("MT_",word,3))
+		word += 3; // take off the MT_
 	for (i = 0; i < nummobjinfo; i++)
 	{
 		if (fastcmp(word, mobjinfo[i]->name))
@@ -4117,6 +4118,8 @@ statenum_t get_state(const char *word)
 	UINT32 i;
 	if (*word >= '0' && *word <= '9')
 		return atoi(word);
+	if (fastncmp("S_",word,2))
+		word += 2; // take off the S_
 	for (i = 0; i < numstates; i++)
 	{
 		if (fastcmp(word, states[i]->name))
diff --git a/src/info.c b/src/info.c
index 7763a5c9fe1dc0cfa9bb47ffe4f75a4f6cef91d1..95bb38ac6d7bc118434e8a1fdc12ea4029b36344 100644
--- a/src/info.c
+++ b/src/info.c
@@ -535,7 +535,7 @@ static const sprite2_t startplayersprites[] =
 	{"WAIT", 0}, 
 	{"WALK", 0}, 
 	{"SKID", SPR2_WALK}, 
-	{"RUN", SPR2_WALK},
+	{"RUN_", SPR2_WALK},
 	{"DASH", SPR2_FRUN}, 
 	{"PAIN", 0}, 
 	{"STUN", SPR2_PAIN}, 
@@ -551,7 +551,7 @@ static const sprite2_t startplayersprites[] =
 
 	{"SPIN", SPR2_ROLL}, 
 
-	{"FLY", SPR2_SPNG},
+	{"FLY_", SPR2_SPNG},
 	{"SWIM", SPR2_FLY}, 
 	{"TIRE", 0}, // (conditional, will never be referenced)
 
@@ -560,7 +560,7 @@ static const sprite2_t startplayersprites[] =
 	{"CLNG", SPR2_CLMB}, 
 	{"CLMB", SPR2_ROLL}, 
 
-	{"FLT", SPR2_WALK},
+	{"FLT_", SPR2_WALK},
 	{"FRUN", SPR2_RUN}, 
 
 	{"BNCE", SPR2_FALL}, 
@@ -620,3309 +620,3309 @@ static const state_t startstates[] =
 	// (or tr_trans10<<FF_TRANSSHIFT if you want to make it hard on yourself)
 
 	// Keep this comment directly above S_NULL.
-	{"S_NULL", 0, SPR_NULL, 0,  1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_UNKNOWN", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_INVISIBLE", 0, SPR_NULL, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_SPAWNSTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 0, 0, S_NULL, 0},
-	{"S_SEESTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 1, 0, S_NULL, 0},
-	{"S_MELEESTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 2, 0, S_NULL, 0},
-	{"S_MISSILESTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 3, 0, S_NULL, 0},
-	{"S_DEATHSTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 4, 0, S_NULL, 0},
-	{"S_XDEATHSTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 5, 0, S_NULL, 0},
-	{"S_RAISESTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 6, 0, S_NULL, 0},
+	{"NULL", 0, SPR_NULL, 0,  1, {NULL}, 0, 0, S_NULL, 0},
+	{"UNKNOWN", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"INVISIBLE", 0, SPR_NULL, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+
+	{"SPAWNSTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 0, 0, S_NULL, 0},
+	{"SEESTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 1, 0, S_NULL, 0},
+	{"MELEESTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 2, 0, S_NULL, 0},
+	{"MISSILESTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 3, 0, S_NULL, 0},
+	{"DEATHSTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 4, 0, S_NULL, 0},
+	{"XDEATHSTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 5, 0, S_NULL, 0},
+	{"RAISESTATE", 0, SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 6, 0, S_NULL, 0},
 
 	// Thok
-	{"S_THOK", 0, SPR_THOK, FF_TRANS50, 8, {NULL}, 0, 0, S_NULL, 0},
+	{"THOK", 0, SPR_THOK, FF_TRANS50, 8, {NULL}, 0, 0, S_NULL, 0},
 
 	// Player
-	{"S_PLAY_STND", 0, SPR_PLAY, SPR2_STND|FF_ANIMATE,    105, {NULL}, 0,  7, S_PLAY_WAIT, 0},
-	{"S_PLAY_WAIT", 0, SPR_PLAY, SPR2_WAIT|FF_ANIMATE,     -1, {NULL}, 0, 16, S_NULL, 0},
-	{"S_PLAY_WALK", 0, SPR_PLAY, SPR2_WALK,                 4, {NULL}, 0,  0, S_PLAY_WALK, 0},
-	{"S_PLAY_SKID", 0, SPR_PLAY, SPR2_SKID,                 1, {NULL}, 0,  0, S_PLAY_WALK, 0},
-	{"S_PLAY_RUN", 0, SPR_PLAY, SPR2_RUN ,                 2, {NULL}, 0,  0, S_PLAY_RUN, 0},
-	{"S_PLAY_DASH", 0, SPR_PLAY, SPR2_DASH,                 2, {NULL}, 0,  0, S_PLAY_DASH, 0},
-	{"S_PLAY_PAIN", 0, SPR_PLAY, SPR2_PAIN|FF_ANIMATE,    350, {NULL}, 0,  4, S_PLAY_FALL, 0},
-	{"S_PLAY_STUN", 0, SPR_PLAY, SPR2_STUN|FF_ANIMATE,    350, {NULL}, 0,  4, S_PLAY_FALL, 0},
-	{"S_PLAY_DEAD", 0, SPR_PLAY, SPR2_DEAD|FF_ANIMATE,     -1, {NULL}, 0,  4, S_NULL, 0},
-	{"S_PLAY_DRWN", 0, SPR_PLAY, SPR2_DRWN|FF_ANIMATE,     -1, {NULL}, 0,  4, S_NULL, 0},
-	{"S_PLAY_ROLL", 0, SPR_PLAY, SPR2_ROLL,                 1, {NULL}, 0,  0, S_PLAY_ROLL, 0},
-	{"S_PLAY_GASP", 0, SPR_PLAY, SPR2_GASP|FF_ANIMATE,     14, {NULL}, 0,  4, S_PLAY_WALK, 0},
-	{"S_PLAY_JUMP", 0, SPR_PLAY, SPR2_JUMP,                 1, {NULL}, 0,  0, S_PLAY_JUMP, 0},
-	{"S_PLAY_SPRING", 0, SPR_PLAY, SPR2_SPNG,                 2, {NULL}, 0,  0, S_PLAY_SPRING, 0},
-	{"S_PLAY_FALL", 0, SPR_PLAY, SPR2_FALL,                 2, {NULL}, 0,  0, S_PLAY_FALL, 0},
-	{"S_PLAY_EDGE", 0, SPR_PLAY, SPR2_EDGE,                12, {NULL}, 0,  0, S_PLAY_EDGE, 0},
-	{"S_PLAY_RIDE", 0, SPR_PLAY, SPR2_RIDE,                 4, {NULL}, 0,  0, S_PLAY_RIDE, 0},
+	{"PLAY_STND", 0, SPR_PLAY, SPR2_STND|FF_ANIMATE,    105, {NULL}, 0,  7, S_PLAY_WAIT, 0},
+	{"PLAY_WAIT", 0, SPR_PLAY, SPR2_WAIT|FF_ANIMATE,     -1, {NULL}, 0, 16, S_NULL, 0},
+	{"PLAY_WALK", 0, SPR_PLAY, SPR2_WALK,                 4, {NULL}, 0,  0, S_PLAY_WALK, 0},
+	{"PLAY_SKID", 0, SPR_PLAY, SPR2_SKID,                 1, {NULL}, 0,  0, S_PLAY_WALK, 0},
+	{"PLAY_RUN", 0, SPR_PLAY, SPR2_RUN ,                 2, {NULL}, 0,  0, S_PLAY_RUN, 0},
+	{"PLAY_DASH", 0, SPR_PLAY, SPR2_DASH,                 2, {NULL}, 0,  0, S_PLAY_DASH, 0},
+	{"PLAY_PAIN", 0, SPR_PLAY, SPR2_PAIN|FF_ANIMATE,    350, {NULL}, 0,  4, S_PLAY_FALL, 0},
+	{"PLAY_STUN", 0, SPR_PLAY, SPR2_STUN|FF_ANIMATE,    350, {NULL}, 0,  4, S_PLAY_FALL, 0},
+	{"PLAY_DEAD", 0, SPR_PLAY, SPR2_DEAD|FF_ANIMATE,     -1, {NULL}, 0,  4, S_NULL, 0},
+	{"PLAY_DRWN", 0, SPR_PLAY, SPR2_DRWN|FF_ANIMATE,     -1, {NULL}, 0,  4, S_NULL, 0},
+	{"PLAY_ROLL", 0, SPR_PLAY, SPR2_ROLL,                 1, {NULL}, 0,  0, S_PLAY_ROLL, 0},
+	{"PLAY_GASP", 0, SPR_PLAY, SPR2_GASP|FF_ANIMATE,     14, {NULL}, 0,  4, S_PLAY_WALK, 0},
+	{"PLAY_JUMP", 0, SPR_PLAY, SPR2_JUMP,                 1, {NULL}, 0,  0, S_PLAY_JUMP, 0},
+	{"PLAY_SPRING", 0, SPR_PLAY, SPR2_SPNG,                 2, {NULL}, 0,  0, S_PLAY_SPRING, 0},
+	{"PLAY_FALL", 0, SPR_PLAY, SPR2_FALL,                 2, {NULL}, 0,  0, S_PLAY_FALL, 0},
+	{"PLAY_EDGE", 0, SPR_PLAY, SPR2_EDGE,                12, {NULL}, 0,  0, S_PLAY_EDGE, 0},
+	{"PLAY_RIDE", 0, SPR_PLAY, SPR2_RIDE,                 4, {NULL}, 0,  0, S_PLAY_RIDE, 0},
 
 	// CA2_SPINDASH
-	{"S_PLAY_SPINDASH", 0, SPR_PLAY, SPR2_SPIN,                 2, {NULL}, 0,  0, S_PLAY_SPINDASH, 0},
+	{"PLAY_SPINDASH", 0, SPR_PLAY, SPR2_SPIN,                 2, {NULL}, 0,  0, S_PLAY_SPINDASH, 0},
 
 	// CA_FLY/CA_SWIM
-	{"S_PLAY_FLY", 0, SPR_PLAY, SPR2_FLY ,                 2, {NULL}, 0,  0, S_PLAY_FLY, 0},
-	{"S_PLAY_SWIM", 0, SPR_PLAY, SPR2_SWIM,                 4, {NULL}, 0,  0, S_PLAY_SWIM, 0},
-	{"S_PLAY_FLY_TIRED", 0, SPR_PLAY, SPR2_TIRE,                12, {NULL}, 0,  0, S_PLAY_FLY_TIRED, 0},
+	{"PLAY_FLY", 0, SPR_PLAY, SPR2_FLY ,                 2, {NULL}, 0,  0, S_PLAY_FLY, 0},
+	{"PLAY_SWIM", 0, SPR_PLAY, SPR2_SWIM,                 4, {NULL}, 0,  0, S_PLAY_SWIM, 0},
+	{"PLAY_FLY_TIRED", 0, SPR_PLAY, SPR2_TIRE,                12, {NULL}, 0,  0, S_PLAY_FLY_TIRED, 0},
 
 	// CA_GLIDEANDCLIMB
-	{"S_PLAY_GLIDE", 0, SPR_PLAY, SPR2_GLID,                 2, {NULL}, 0,  0, S_PLAY_GLIDE, 0},
-	{"S_PLAY_GLIDE_LANDING", 0, SPR_PLAY, SPR2_LAND,                 7, {NULL}, 0,  0, S_PLAY_STND, 0},
-	{"S_PLAY_CLING", 0, SPR_PLAY, SPR2_CLNG|FF_ANIMATE,     -1, {NULL}, 0,  4, S_NULL, 0},
-	{"S_PLAY_CLIMB", 0, SPR_PLAY, SPR2_CLMB,                 5, {NULL}, 0,  0, S_PLAY_CLIMB, 0},
+	{"PLAY_GLIDE", 0, SPR_PLAY, SPR2_GLID,                 2, {NULL}, 0,  0, S_PLAY_GLIDE, 0},
+	{"PLAY_GLIDE_LANDING", 0, SPR_PLAY, SPR2_LAND,                 7, {NULL}, 0,  0, S_PLAY_STND, 0},
+	{"PLAY_CLING", 0, SPR_PLAY, SPR2_CLNG|FF_ANIMATE,     -1, {NULL}, 0,  4, S_NULL, 0},
+	{"PLAY_CLIMB", 0, SPR_PLAY, SPR2_CLMB,                 5, {NULL}, 0,  0, S_PLAY_CLIMB, 0},
 
 	// CA_FLOAT/CA_SLOWFALL
-	{"S_PLAY_FLOAT", 0, SPR_PLAY, SPR2_FLT ,                 7, {NULL}, 0,  0, S_PLAY_FLOAT, 0},
-	{"S_PLAY_FLOAT_RUN", 0, SPR_PLAY, SPR2_FRUN,                 7, {NULL}, 0,  0, S_PLAY_FLOAT_RUN, 0},
+	{"PLAY_FLOAT", 0, SPR_PLAY, SPR2_FLT ,                 7, {NULL}, 0,  0, S_PLAY_FLOAT, 0},
+	{"PLAY_FLOAT_RUN", 0, SPR_PLAY, SPR2_FRUN,                 7, {NULL}, 0,  0, S_PLAY_FLOAT_RUN, 0},
 
 	// CA_BOUNCE
-	{"S_PLAY_BOUNCE", 0, SPR_PLAY, SPR2_BNCE|FF_ANIMATE,     -1, {NULL},             0,  0, S_NULL, 0},
-	{"S_PLAY_BOUNCE_LANDING", 0, SPR_PLAY, SPR2_LAND|FF_SPR2ENDSTATE, 2, {NULL}, S_PLAY_BOUNCE,  0, S_PLAY_BOUNCE_LANDING, 0},
+	{"PLAY_BOUNCE", 0, SPR_PLAY, SPR2_BNCE|FF_ANIMATE,     -1, {NULL},             0,  0, S_NULL, 0},
+	{"PLAY_BOUNCE_LANDING", 0, SPR_PLAY, SPR2_LAND|FF_SPR2ENDSTATE, 2, {NULL}, S_PLAY_BOUNCE,  0, S_PLAY_BOUNCE_LANDING, 0},
 
 	// CA2_GUNSLINGER
-	{"S_PLAY_FIRE", 0, SPR_PLAY, SPR2_FIRE|FF_SPR2ENDSTATE,  2, {NULL}, S_PLAY_FIRE_FINISH, 0, S_PLAY_FIRE, 0},
-	{"S_PLAY_FIRE_FINISH", 0, SPR_PLAY, SPR2_FIRE,                 15, {NULL},        S_PLAY_STND, 0, S_PLAY_STND, 0},
+	{"PLAY_FIRE", 0, SPR_PLAY, SPR2_FIRE|FF_SPR2ENDSTATE,  2, {NULL}, S_PLAY_FIRE_FINISH, 0, S_PLAY_FIRE, 0},
+	{"PLAY_FIRE_FINISH", 0, SPR_PLAY, SPR2_FIRE,                 15, {NULL},        S_PLAY_STND, 0, S_PLAY_STND, 0},
 
 	// CA_TWINSPIN
-	{"S_PLAY_TWINSPIN", 0, SPR_PLAY, SPR2_TWIN|FF_SPR2ENDSTATE, 2, {NULL}, S_PLAY_JUMP, 0, S_PLAY_TWINSPIN, 0},
+	{"PLAY_TWINSPIN", 0, SPR_PLAY, SPR2_TWIN|FF_SPR2ENDSTATE, 2, {NULL}, S_PLAY_JUMP, 0, S_PLAY_TWINSPIN, 0},
 
 	// CA2_MELEE
-	{"S_PLAY_MELEE", 0, SPR_PLAY, SPR2_MLEE|FF_SPR2ENDSTATE, 2, {NULL}, S_PLAY_MELEE_FINISH, 0, S_PLAY_MELEE, 0},
-	{"S_PLAY_MELEE_FINISH", 0, SPR_PLAY, SPR2_MLEE,                70, {NULL},                   0, 0, S_PLAY_FALL, 0},
-	{"S_PLAY_MELEE_LANDING", 0, SPR_PLAY, SPR2_MLEL,                35, {NULL},                   0, 0, S_PLAY_WALK, 0},
+	{"PLAY_MELEE", 0, SPR_PLAY, SPR2_MLEE|FF_SPR2ENDSTATE, 2, {NULL}, S_PLAY_MELEE_FINISH, 0, S_PLAY_MELEE, 0},
+	{"PLAY_MELEE_FINISH", 0, SPR_PLAY, SPR2_MLEE,                70, {NULL},                   0, 0, S_PLAY_FALL, 0},
+	{"PLAY_MELEE_LANDING", 0, SPR_PLAY, SPR2_MLEL,                35, {NULL},                   0, 0, S_PLAY_WALK, 0},
 
 	// SF_SUPER
-	{"S_PLAY_SUPER_TRANS1", 0, SPR_PLAY, SPR2_TRNS|FF_SPR2SUPER|FF_ANIMATE,     7, {NULL},          0, 4, S_PLAY_SUPER_TRANS2, 0},
-	{"S_PLAY_SUPER_TRANS2", 0, SPR_PLAY, SPR2_TRNS|FF_SPR2SUPER,                3, {NULL},          0, 0, S_PLAY_SUPER_TRANS3, 0},
-	{"S_PLAY_SUPER_TRANS3", 0, SPR_PLAY, SPR2_TRNS|FF_SPR2SUPER|FF_FULLBRIGHT,  2, {NULL},          0, 0, S_PLAY_SUPER_TRANS4, 0},
-	{"S_PLAY_SUPER_TRANS4", 0, SPR_PLAY, SPR2_TRNS|FF_SPR2SUPER|FF_FULLBRIGHT,  2, {NULL},          0, 0, S_PLAY_SUPER_TRANS5, 0},
-	{"S_PLAY_SUPER_TRANS5", 0, SPR_PLAY, SPR2_TRNS|FF_SPR2SUPER|FF_FULLBRIGHT,  2, {NULL},          0, 0, S_PLAY_SUPER_TRANS6, 0},
-	{"S_PLAY_SUPER_TRANS6", 0, SPR_PLAY, SPR2_TRNS|FF_SPR2SUPER|FF_FULLBRIGHT, 19, {A_FadeOverlay}, 0, 0, S_PLAY_FALL, 0},
+	{"PLAY_SUPER_TRANS1", 0, SPR_PLAY, SPR2_TRNS|FF_SPR2SUPER|FF_ANIMATE,     7, {NULL},          0, 4, S_PLAY_SUPER_TRANS2, 0},
+	{"PLAY_SUPER_TRANS2", 0, SPR_PLAY, SPR2_TRNS|FF_SPR2SUPER,                3, {NULL},          0, 0, S_PLAY_SUPER_TRANS3, 0},
+	{"PLAY_SUPER_TRANS3", 0, SPR_PLAY, SPR2_TRNS|FF_SPR2SUPER|FF_FULLBRIGHT,  2, {NULL},          0, 0, S_PLAY_SUPER_TRANS4, 0},
+	{"PLAY_SUPER_TRANS4", 0, SPR_PLAY, SPR2_TRNS|FF_SPR2SUPER|FF_FULLBRIGHT,  2, {NULL},          0, 0, S_PLAY_SUPER_TRANS5, 0},
+	{"PLAY_SUPER_TRANS5", 0, SPR_PLAY, SPR2_TRNS|FF_SPR2SUPER|FF_FULLBRIGHT,  2, {NULL},          0, 0, S_PLAY_SUPER_TRANS6, 0},
+	{"PLAY_SUPER_TRANS6", 0, SPR_PLAY, SPR2_TRNS|FF_SPR2SUPER|FF_FULLBRIGHT, 19, {A_FadeOverlay}, 0, 0, S_PLAY_FALL, 0},
 
-	{"S_OBJPLACE_DUMMY", 0, SPR_NULL, 0, -1, {NULL}, 0, 0, S_OBJPLACE_DUMMY, 0},
+	{"OBJPLACE_DUMMY", 0, SPR_NULL, 0, -1, {NULL}, 0, 0, S_OBJPLACE_DUMMY, 0},
 
 	// 1-Up box sprites (uses player sprite)
-	{"S_PLAY_BOX1", 0, SPR_PLAY, SPR2_LIFE,  2, {NULL}, 0, 18, S_PLAY_BOX2, 0},
-	{"S_PLAY_BOX2", 0, SPR_NULL,         0,  1, {NULL}, 0, 18, S_PLAY_BOX1, 0},
-	{"S_PLAY_ICON1", 0, SPR_PLAY, SPR2_LIFE,  4, {NULL}, 0,  4, S_PLAY_ICON2, 0},
-	{"S_PLAY_ICON2", 0, SPR_NULL,         0, 12, {NULL}, 0,  4, S_PLAY_ICON3, 0},
-	{"S_PLAY_ICON3", 0, SPR_PLAY, SPR2_LIFE, 20, {NULL}, 0,  4, S_NULL, 0},
+	{"PLAY_BOX1", 0, SPR_PLAY, SPR2_LIFE,  2, {NULL}, 0, 18, S_PLAY_BOX2, 0},
+	{"PLAY_BOX2", 0, SPR_NULL,         0,  1, {NULL}, 0, 18, S_PLAY_BOX1, 0},
+	{"PLAY_ICON1", 0, SPR_PLAY, SPR2_LIFE,  4, {NULL}, 0,  4, S_PLAY_ICON2, 0},
+	{"PLAY_ICON2", 0, SPR_NULL,         0, 12, {NULL}, 0,  4, S_PLAY_ICON3, 0},
+	{"PLAY_ICON3", 0, SPR_PLAY, SPR2_LIFE, 20, {NULL}, 0,  4, S_NULL, 0},
 
 	// Level end sign (uses player sprite)
-	{"S_PLAY_SIGN", 0, SPR_PLAY, SPR2_SIGN|FF_PAPERSPRITE, 2, {NULL}, 0, 29, S_PLAY_SIGN, 0},
+	{"PLAY_SIGN", 0, SPR_PLAY, SPR2_SIGN|FF_PAPERSPRITE, 2, {NULL}, 0, 29, S_PLAY_SIGN, 0},
 
 	// NiGHTS Player, transforming
-	{"S_PLAY_NIGHTS_TRANS1", 0, SPR_PLAY, SPR2_TRNS|FF_ANIMATE,     7, {NULL},          0, 4, S_PLAY_NIGHTS_TRANS2, 0},
-	{"S_PLAY_NIGHTS_TRANS2", 0, SPR_PLAY, SPR2_TRNS,                3, {NULL},          0, 0, S_PLAY_NIGHTS_TRANS3, 0},
-	{"S_PLAY_NIGHTS_TRANS3", 0, SPR_PLAY, SPR2_TRNS|FF_FULLBRIGHT,  2, {NULL},          0, 0, S_PLAY_NIGHTS_TRANS4, 0},
-	{"S_PLAY_NIGHTS_TRANS4", 0, SPR_PLAY, SPR2_TRNS|FF_FULLBRIGHT,  2, {NULL},          0, 0, S_PLAY_NIGHTS_TRANS5, 0},
-	{"S_PLAY_NIGHTS_TRANS5", 0, SPR_PLAY, SPR2_TRNS|FF_FULLBRIGHT,  2, {NULL},          0, 0, S_PLAY_NIGHTS_TRANS6, 0},
-	{"S_PLAY_NIGHTS_TRANS5", 0, SPR_PLAY, SPR2_TRNS|FF_FULLBRIGHT, 21, {A_FadeOverlay}, 2, 0, S_PLAY_NIGHTS_FLOAT, 0},
+	{"PLAY_NIGHTS_TRANS1", 0, SPR_PLAY, SPR2_TRNS|FF_ANIMATE,     7, {NULL},          0, 4, S_PLAY_NIGHTS_TRANS2, 0},
+	{"PLAY_NIGHTS_TRANS2", 0, SPR_PLAY, SPR2_TRNS,                3, {NULL},          0, 0, S_PLAY_NIGHTS_TRANS3, 0},
+	{"PLAY_NIGHTS_TRANS3", 0, SPR_PLAY, SPR2_TRNS|FF_FULLBRIGHT,  2, {NULL},          0, 0, S_PLAY_NIGHTS_TRANS4, 0},
+	{"PLAY_NIGHTS_TRANS4", 0, SPR_PLAY, SPR2_TRNS|FF_FULLBRIGHT,  2, {NULL},          0, 0, S_PLAY_NIGHTS_TRANS5, 0},
+	{"PLAY_NIGHTS_TRANS5", 0, SPR_PLAY, SPR2_TRNS|FF_FULLBRIGHT,  2, {NULL},          0, 0, S_PLAY_NIGHTS_TRANS6, 0},
+	{"PLAY_NIGHTS_TRANS5", 0, SPR_PLAY, SPR2_TRNS|FF_FULLBRIGHT, 21, {A_FadeOverlay}, 2, 0, S_PLAY_NIGHTS_FLOAT, 0},
 
 	// NiGHTS Player
-	{"S_PLAY_NIGHTS_STAND", 0, SPR_PLAY, SPR2_NSTD, 7, {NULL}, 0, 0, S_PLAY_NIGHTS_STAND, 0},
-	{"S_PLAY_NIGHTS_FLOAT", 0, SPR_PLAY, SPR2_NFLT, 7, {NULL}, 0, 0, S_PLAY_NIGHTS_FLOAT, 0},
-	{"S_PLAY_NIGHTS_FLY", 0, SPR_PLAY, SPR2_NFLY, 2, {NULL}, 0, 0, S_PLAY_NIGHTS_FLY, 0},
-	{"S_PLAY_NIGHTS_DRILL", 0, SPR_PLAY, SPR2_NDRL, 2, {NULL}, 0, 0, S_PLAY_NIGHTS_DRILL, 0},
-	{"S_PLAY_NIGHTS_STUN", 0, SPR_PLAY, SPR2_NSTN, 2, {NULL}, 0, 0, S_PLAY_NIGHTS_STUN, 0},
-	{"S_PLAY_NIGHTS_PULL", 0, SPR_PLAY, SPR2_NPUL, 1, {NULL}, 0, 0, S_PLAY_NIGHTS_PULL, 0},
-	{"S_PLAY_NIGHTS_ATTACK", 0, SPR_PLAY, SPR2_NATK, 1, {NULL}, 0, 0, S_PLAY_NIGHTS_ATTACK, 0},
+	{"PLAY_NIGHTS_STAND", 0, SPR_PLAY, SPR2_NSTD, 7, {NULL}, 0, 0, S_PLAY_NIGHTS_STAND, 0},
+	{"PLAY_NIGHTS_FLOAT", 0, SPR_PLAY, SPR2_NFLT, 7, {NULL}, 0, 0, S_PLAY_NIGHTS_FLOAT, 0},
+	{"PLAY_NIGHTS_FLY", 0, SPR_PLAY, SPR2_NFLY, 2, {NULL}, 0, 0, S_PLAY_NIGHTS_FLY, 0},
+	{"PLAY_NIGHTS_DRILL", 0, SPR_PLAY, SPR2_NDRL, 2, {NULL}, 0, 0, S_PLAY_NIGHTS_DRILL, 0},
+	{"PLAY_NIGHTS_STUN", 0, SPR_PLAY, SPR2_NSTN, 2, {NULL}, 0, 0, S_PLAY_NIGHTS_STUN, 0},
+	{"PLAY_NIGHTS_PULL", 0, SPR_PLAY, SPR2_NPUL, 1, {NULL}, 0, 0, S_PLAY_NIGHTS_PULL, 0},
+	{"PLAY_NIGHTS_ATTACK", 0, SPR_PLAY, SPR2_NATK, 1, {NULL}, 0, 0, S_PLAY_NIGHTS_ATTACK, 0},
 
 	// c:
-	{"S_TAILSOVERLAY_STAND", 0, SPR_PLAY, SPR2_TAL0|FF_SPR2MIDSTART,  5, {NULL}, 0, 0, S_TAILSOVERLAY_STAND, 0},
-	{"S_TAILSOVERLAY_0DEGREES", 0, SPR_PLAY, SPR2_TAL1|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_0DEGREES, 0},
-	{"S_TAILSOVERLAY_PLUS30DEGREES", 0, SPR_PLAY, SPR2_TAL2|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_PLUS30DEGREES, 0},
-	{"S_TAILSOVERLAY_PLUS60DEGREES", 0, SPR_PLAY, SPR2_TAL3|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_PLUS60DEGREES, 0},
-	{"S_TAILSOVERLAY_MINUS30DEGREES", 0, SPR_PLAY, SPR2_TAL4|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_MINUS30DEGREES, 0},
-	{"S_TAILSOVERLAY_MINUS60DEGREES", 0, SPR_PLAY, SPR2_TAL5|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_MINUS60DEGREES, 0},
-	{"S_TAILSOVERLAY_RUN", 0, SPR_PLAY, SPR2_TAL6|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_RUN, 0},
-	{"S_TAILSOVERLAY_FLY", 0, SPR_PLAY, SPR2_TAL7|FF_SPR2MIDSTART,  4, {NULL}, 0, 0, S_TAILSOVERLAY_FLY, 0},
-	{"S_TAILSOVERLAY_TIRE", 0, SPR_PLAY, SPR2_TAL8|FF_SPR2MIDSTART,  4, {NULL}, 0, 0, S_TAILSOVERLAY_TIRE, 0},
-	{"S_TAILSOVERLAY_PAIN", 0, SPR_PLAY, SPR2_TAL9|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_PAIN, 0},
-	{"S_TAILSOVERLAY_GASP", 0, SPR_PLAY, SPR2_TALA|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_GASP, 0},
-	{"S_TAILSOVERLAY_EDGE", 0, SPR_PLAY, SPR2_TALB                , 35, {NULL}, 0, 0, S_TAILSOVERLAY_EDGE, 0},
-	{"S_TAILSOVERLAY_DASH", 0, SPR_PLAY, SPR2_TALC|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_DASH, 0},
+	{"TAILSOVERLAY_STAND", 0, SPR_PLAY, SPR2_TAL0|FF_SPR2MIDSTART,  5, {NULL}, 0, 0, S_TAILSOVERLAY_STAND, 0},
+	{"TAILSOVERLAY_0DEGREES", 0, SPR_PLAY, SPR2_TAL1|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_0DEGREES, 0},
+	{"TAILSOVERLAY_PLUS30DEGREES", 0, SPR_PLAY, SPR2_TAL2|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_PLUS30DEGREES, 0},
+	{"TAILSOVERLAY_PLUS60DEGREES", 0, SPR_PLAY, SPR2_TAL3|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_PLUS60DEGREES, 0},
+	{"TAILSOVERLAY_MINUS30DEGREES", 0, SPR_PLAY, SPR2_TAL4|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_MINUS30DEGREES, 0},
+	{"TAILSOVERLAY_MINUS60DEGREES", 0, SPR_PLAY, SPR2_TAL5|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_MINUS60DEGREES, 0},
+	{"TAILSOVERLAY_RUN", 0, SPR_PLAY, SPR2_TAL6|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_RUN, 0},
+	{"TAILSOVERLAY_FLY", 0, SPR_PLAY, SPR2_TAL7|FF_SPR2MIDSTART,  4, {NULL}, 0, 0, S_TAILSOVERLAY_FLY, 0},
+	{"TAILSOVERLAY_TIRE", 0, SPR_PLAY, SPR2_TAL8|FF_SPR2MIDSTART,  4, {NULL}, 0, 0, S_TAILSOVERLAY_TIRE, 0},
+	{"TAILSOVERLAY_PAIN", 0, SPR_PLAY, SPR2_TAL9|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_PAIN, 0},
+	{"TAILSOVERLAY_GASP", 0, SPR_PLAY, SPR2_TALA|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_GASP, 0},
+	{"TAILSOVERLAY_EDGE", 0, SPR_PLAY, SPR2_TALB                , 35, {NULL}, 0, 0, S_TAILSOVERLAY_EDGE, 0},
+	{"TAILSOVERLAY_DASH", 0, SPR_PLAY, SPR2_TALC|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_DASH, 0},
 
 	// [:
-	{"S_JETFUMEFLASH", 0, SPR_JETF, 3|FF_ANIMATE|FF_FULLBRIGHT, 2, {NULL}, 1, 1, S_JETFUME1, 0},
+	{"JETFUMEFLASH", 0, SPR_JETF, 3|FF_ANIMATE|FF_FULLBRIGHT, 2, {NULL}, 1, 1, S_JETFUME1, 0},
 
 	// Blue Crawla
-	{"S_POSS_STND", 0, SPR_POSS, 0, 5, {A_Look}, 0, 0, S_POSS_STND, 0},
-	{"S_POSS_RUN1", 0, SPR_POSS, 0, 3, {A_Chase}, 0, 0, S_POSS_RUN2, 0},
-	{"S_POSS_RUN2", 0, SPR_POSS, 1, 3, {A_Chase}, 0, 0, S_POSS_RUN3, 0},
-	{"S_POSS_RUN3", 0, SPR_POSS, 2, 3, {A_Chase}, 0, 0, S_POSS_RUN4, 0},
-	{"S_POSS_RUN4", 0, SPR_POSS, 3, 3, {A_Chase}, 0, 0, S_POSS_RUN5, 0},
-	{"S_POSS_RUN5", 0, SPR_POSS, 4, 3, {A_Chase}, 0, 0, S_POSS_RUN6, 0},
-	{"S_POSS_RUN6", 0, SPR_POSS, 5, 3, {A_Chase}, 0, 0, S_POSS_RUN1, 0},
+	{"POSS_STND", 0, SPR_POSS, 0, 5, {A_Look}, 0, 0, S_POSS_STND, 0},
+	{"POSS_RUN1", 0, SPR_POSS, 0, 3, {A_Chase}, 0, 0, S_POSS_RUN2, 0},
+	{"POSS_RUN2", 0, SPR_POSS, 1, 3, {A_Chase}, 0, 0, S_POSS_RUN3, 0},
+	{"POSS_RUN3", 0, SPR_POSS, 2, 3, {A_Chase}, 0, 0, S_POSS_RUN4, 0},
+	{"POSS_RUN4", 0, SPR_POSS, 3, 3, {A_Chase}, 0, 0, S_POSS_RUN5, 0},
+	{"POSS_RUN5", 0, SPR_POSS, 4, 3, {A_Chase}, 0, 0, S_POSS_RUN6, 0},
+	{"POSS_RUN6", 0, SPR_POSS, 5, 3, {A_Chase}, 0, 0, S_POSS_RUN1, 0},
 
 	// Red Crawla
-	{"S_SPOS_STND", 0, SPR_SPOS, 0, 5, {A_Look}, 0, 0, S_SPOS_STND, 0},
-	{"S_SPOS_RUN1", 0, SPR_SPOS, 0, 1, {A_Chase}, 0, 0, S_SPOS_RUN2, 0},
-	{"S_SPOS_RUN2", 0, SPR_SPOS, 1, 1, {A_Chase}, 0, 0, S_SPOS_RUN3, 0},
-	{"S_SPOS_RUN3", 0, SPR_SPOS, 2, 1, {A_Chase}, 0, 0, S_SPOS_RUN4, 0},
-	{"S_SPOS_RUN4", 0, SPR_SPOS, 3, 1, {A_Chase}, 0, 0, S_SPOS_RUN5, 0},
-	{"S_SPOS_RUN5", 0, SPR_SPOS, 4, 1, {A_Chase}, 0, 0, S_SPOS_RUN6, 0},
-	{"S_SPOS_RUN6", 0, SPR_SPOS, 5, 1, {A_Chase}, 0, 0, S_SPOS_RUN1, 0},
+	{"SPOS_STND", 0, SPR_SPOS, 0, 5, {A_Look}, 0, 0, S_SPOS_STND, 0},
+	{"SPOS_RUN1", 0, SPR_SPOS, 0, 1, {A_Chase}, 0, 0, S_SPOS_RUN2, 0},
+	{"SPOS_RUN2", 0, SPR_SPOS, 1, 1, {A_Chase}, 0, 0, S_SPOS_RUN3, 0},
+	{"SPOS_RUN3", 0, SPR_SPOS, 2, 1, {A_Chase}, 0, 0, S_SPOS_RUN4, 0},
+	{"SPOS_RUN4", 0, SPR_SPOS, 3, 1, {A_Chase}, 0, 0, S_SPOS_RUN5, 0},
+	{"SPOS_RUN5", 0, SPR_SPOS, 4, 1, {A_Chase}, 0, 0, S_SPOS_RUN6, 0},
+	{"SPOS_RUN6", 0, SPR_SPOS, 5, 1, {A_Chase}, 0, 0, S_SPOS_RUN1, 0},
 
 	// Greenflower Fish
-	{"S_FISH1", 0, SPR_FISH, 1, 1, {NULL}, 0, 0, S_FISH2, 0},
-	{"S_FISH2", 0, SPR_FISH, 1, 1, {A_FishJump}, 0, 0, S_FISH1, 0},
-	{"S_FISH3", 0, SPR_FISH, 0, 1, {NULL}, 0, 0, S_FISH4, 0},
-	{"S_FISH4", 0, SPR_FISH, 0, 1, {A_FishJump}, 0, 0, S_FISH3, 0},
+	{"FISH1", 0, SPR_FISH, 1, 1, {NULL}, 0, 0, S_FISH2, 0},
+	{"FISH2", 0, SPR_FISH, 1, 1, {A_FishJump}, 0, 0, S_FISH1, 0},
+	{"FISH3", 0, SPR_FISH, 0, 1, {NULL}, 0, 0, S_FISH4, 0},
+	{"FISH4", 0, SPR_FISH, 0, 1, {A_FishJump}, 0, 0, S_FISH3, 0},
 
 	// Gold Buzz
-	{"S_BUZZLOOK1", 0, SPR_BUZZ, 0, 2, {A_Look}, 0, 0, S_BUZZLOOK2, 0},
-	{"S_BUZZLOOK2", 0, SPR_BUZZ, 1, 2, {A_Look}, 0, 0, S_BUZZLOOK1, 0},
-	{"S_BUZZFLY1", 0, SPR_BUZZ, 0, 2, {A_BuzzFly}, sfx_buzz4, 0, S_BUZZFLY2, 0},
-	{"S_BUZZFLY2", 0, SPR_BUZZ, 1, 2, {A_BuzzFly}, 0, 0, S_BUZZFLY1, 0},
+	{"BUZZLOOK1", 0, SPR_BUZZ, 0, 2, {A_Look}, 0, 0, S_BUZZLOOK2, 0},
+	{"BUZZLOOK2", 0, SPR_BUZZ, 1, 2, {A_Look}, 0, 0, S_BUZZLOOK1, 0},
+	{"BUZZFLY1", 0, SPR_BUZZ, 0, 2, {A_BuzzFly}, sfx_buzz4, 0, S_BUZZFLY2, 0},
+	{"BUZZFLY2", 0, SPR_BUZZ, 1, 2, {A_BuzzFly}, 0, 0, S_BUZZFLY1, 0},
 
 	// Red Buzz
-	{"S_RBUZZLOOK1", 0, SPR_RBUZ, 0, 2, {A_Look}, 0, 0, S_RBUZZLOOK2, 0},
-	{"S_RBUZZLOOK2", 0, SPR_RBUZ, 1, 2, {A_Look}, 0, 0, S_RBUZZLOOK1, 0},
-	{"S_RBUZZFLY1", 0, SPR_RBUZ, 0, 2, {A_BuzzFly}, sfx_buzz4, 0, S_RBUZZFLY2, 0},
-	{"S_RBUZZFLY2", 0, SPR_RBUZ, 1, 2, {A_BuzzFly}, 0, 0, S_RBUZZFLY1, 0},
+	{"RBUZZLOOK1", 0, SPR_RBUZ, 0, 2, {A_Look}, 0, 0, S_RBUZZLOOK2, 0},
+	{"RBUZZLOOK2", 0, SPR_RBUZ, 1, 2, {A_Look}, 0, 0, S_RBUZZLOOK1, 0},
+	{"RBUZZFLY1", 0, SPR_RBUZ, 0, 2, {A_BuzzFly}, sfx_buzz4, 0, S_RBUZZFLY2, 0},
+	{"RBUZZFLY2", 0, SPR_RBUZ, 1, 2, {A_BuzzFly}, 0, 0, S_RBUZZFLY1, 0},
 
 	// Jetty-Syn Bomber
-	{"S_JETBLOOK1", 0, SPR_JETB, 0, 4, {A_Look}, 0, 0, S_JETBLOOK2, 0},
-	{"S_JETBLOOK2", 0, SPR_JETB, 1, 4, {A_Look}, 0, 0, S_JETBLOOK1, 0},
-	{"S_JETBZOOM1", 0, SPR_JETB, 0, 1, {A_JetbThink}, 0, 0, S_JETBZOOM2, 0},
-	{"S_JETBZOOM2", 0, SPR_JETB, 1, 1, {A_JetbThink}, 0, 0, S_JETBZOOM1, 0},
+	{"JETBLOOK1", 0, SPR_JETB, 0, 4, {A_Look}, 0, 0, S_JETBLOOK2, 0},
+	{"JETBLOOK2", 0, SPR_JETB, 1, 4, {A_Look}, 0, 0, S_JETBLOOK1, 0},
+	{"JETBZOOM1", 0, SPR_JETB, 0, 1, {A_JetbThink}, 0, 0, S_JETBZOOM2, 0},
+	{"JETBZOOM2", 0, SPR_JETB, 1, 1, {A_JetbThink}, 0, 0, S_JETBZOOM1, 0},
 
 	// Jetty-Syn Gunner
-	{"S_JETGLOOK1", 0, SPR_JETG, 0, 4, {A_Look}, 0, 0, S_JETGLOOK2, 0},
-	{"S_JETGLOOK2", 0, SPR_JETG, 1, 4, {A_Look}, 0, 0, S_JETGLOOK1, 0},
-	{"S_JETGZOOM1", 0, SPR_JETG, 0, 1, {A_JetgThink}, 0, 0, S_JETGZOOM2, 0},
-	{"S_JETGZOOM2", 0, SPR_JETG, 1, 1, {A_JetgThink}, 0, 0, S_JETGZOOM1, 0},
-	{"S_JETGSHOOT1", 0, SPR_JETG, 2, 1, {A_JetgShoot}, 0, 0, S_JETGSHOOT2, 0},
-	{"S_JETGSHOOT2", 0, SPR_JETG, 3, 1, {NULL}, 0, 0, S_JETGZOOM1, 0},
+	{"JETGLOOK1", 0, SPR_JETG, 0, 4, {A_Look}, 0, 0, S_JETGLOOK2, 0},
+	{"JETGLOOK2", 0, SPR_JETG, 1, 4, {A_Look}, 0, 0, S_JETGLOOK1, 0},
+	{"JETGZOOM1", 0, SPR_JETG, 0, 1, {A_JetgThink}, 0, 0, S_JETGZOOM2, 0},
+	{"JETGZOOM2", 0, SPR_JETG, 1, 1, {A_JetgThink}, 0, 0, S_JETGZOOM1, 0},
+	{"JETGSHOOT1", 0, SPR_JETG, 2, 1, {A_JetgShoot}, 0, 0, S_JETGSHOOT2, 0},
+	{"JETGSHOOT2", 0, SPR_JETG, 3, 1, {NULL}, 0, 0, S_JETGZOOM1, 0},
 
 	// Crawla Commander
-	{"S_CCOMMAND1", 0, SPR_CCOM, 0, 1, {A_CrawlaCommanderThink}, 0, 15*FRACUNIT, S_CCOMMAND2, 0},
-	{"S_CCOMMAND2", 0, SPR_CCOM, 1, 1, {A_CrawlaCommanderThink}, 0, 15*FRACUNIT, S_CCOMMAND1, 0},
-	{"S_CCOMMAND3", 0, SPR_CCOM, 2, 1, {A_CrawlaCommanderThink}, 0, 15*FRACUNIT, S_CCOMMAND4, 0},
-	{"S_CCOMMAND4", 0, SPR_CCOM, 3, 1, {A_CrawlaCommanderThink}, 0, 15*FRACUNIT, S_CCOMMAND3, 0},
+	{"CCOMMAND1", 0, SPR_CCOM, 0, 1, {A_CrawlaCommanderThink}, 0, 15*FRACUNIT, S_CCOMMAND2, 0},
+	{"CCOMMAND2", 0, SPR_CCOM, 1, 1, {A_CrawlaCommanderThink}, 0, 15*FRACUNIT, S_CCOMMAND1, 0},
+	{"CCOMMAND3", 0, SPR_CCOM, 2, 1, {A_CrawlaCommanderThink}, 0, 15*FRACUNIT, S_CCOMMAND4, 0},
+	{"CCOMMAND4", 0, SPR_CCOM, 3, 1, {A_CrawlaCommanderThink}, 0, 15*FRACUNIT, S_CCOMMAND3, 0},
 
 	// Deton
-	{"S_DETON1", 0, SPR_DETN, 0, 35, {A_Look}, 0, 0, S_DETON1, 0},
-	{"S_DETON2", 0, SPR_DETN, 0,  1, {A_DetonChase}, 0, 0, S_DETON3, 0},
-	{"S_DETON3", 0, SPR_DETN, 1,  1, {A_DetonChase}, 0, 0, S_DETON4, 0},
-	{"S_DETON4", 0, SPR_DETN, 2,  1, {A_DetonChase}, 0, 0, S_DETON5, 0},
-	{"S_DETON5", 0, SPR_DETN, 3,  1, {A_DetonChase}, 0, 0, S_DETON6, 0},
-	{"S_DETON6", 0, SPR_DETN, 4,  1, {A_DetonChase}, 0, 0, S_DETON7, 0},
-	{"S_DETON7", 0, SPR_DETN, 5,  1, {A_DetonChase}, 0, 0, S_DETON8, 0},
-	{"S_DETON8", 0, SPR_DETN, 6,  1, {A_DetonChase}, 0, 0, S_DETON9, 0},
-	{"S_DETON9", 0, SPR_DETN, 7,  1, {A_DetonChase}, 0, 0, S_DETON10, 0},
-	{"S_DETON10", 0, SPR_DETN, 6,  1, {A_DetonChase}, 0, 0, S_DETON11, 0},
-	{"S_DETON11", 0, SPR_DETN, 5,  1, {A_DetonChase}, 0, 0, S_DETON12, 0},
-	{"S_DETON12", 0, SPR_DETN, 4,  1, {A_DetonChase}, 0, 0, S_DETON13, 0},
-	{"S_DETON13", 0, SPR_DETN, 3,  1, {A_DetonChase}, 0, 0, S_DETON14, 0},
-	{"S_DETON14", 0, SPR_DETN, 2,  1, {A_DetonChase}, 0, 0, S_DETON15, 0},
-	{"S_DETON15", 0, SPR_DETN, 1,  1, {A_DetonChase}, 0, 0, S_DETON2, 0},
+	{"DETON1", 0, SPR_DETN, 0, 35, {A_Look}, 0, 0, S_DETON1, 0},
+	{"DETON2", 0, SPR_DETN, 0,  1, {A_DetonChase}, 0, 0, S_DETON3, 0},
+	{"DETON3", 0, SPR_DETN, 1,  1, {A_DetonChase}, 0, 0, S_DETON4, 0},
+	{"DETON4", 0, SPR_DETN, 2,  1, {A_DetonChase}, 0, 0, S_DETON5, 0},
+	{"DETON5", 0, SPR_DETN, 3,  1, {A_DetonChase}, 0, 0, S_DETON6, 0},
+	{"DETON6", 0, SPR_DETN, 4,  1, {A_DetonChase}, 0, 0, S_DETON7, 0},
+	{"DETON7", 0, SPR_DETN, 5,  1, {A_DetonChase}, 0, 0, S_DETON8, 0},
+	{"DETON8", 0, SPR_DETN, 6,  1, {A_DetonChase}, 0, 0, S_DETON9, 0},
+	{"DETON9", 0, SPR_DETN, 7,  1, {A_DetonChase}, 0, 0, S_DETON10, 0},
+	{"DETON10", 0, SPR_DETN, 6,  1, {A_DetonChase}, 0, 0, S_DETON11, 0},
+	{"DETON11", 0, SPR_DETN, 5,  1, {A_DetonChase}, 0, 0, S_DETON12, 0},
+	{"DETON12", 0, SPR_DETN, 4,  1, {A_DetonChase}, 0, 0, S_DETON13, 0},
+	{"DETON13", 0, SPR_DETN, 3,  1, {A_DetonChase}, 0, 0, S_DETON14, 0},
+	{"DETON14", 0, SPR_DETN, 2,  1, {A_DetonChase}, 0, 0, S_DETON15, 0},
+	{"DETON15", 0, SPR_DETN, 1,  1, {A_DetonChase}, 0, 0, S_DETON2, 0},
 
 	// Skim Mine Dropper
-	{"S_SKIM1", 0, SPR_SKIM, 0,  1, {A_SkimChase}, 0, 0, S_SKIM2, 0},
-	{"S_SKIM2", 0, SPR_SKIM, 0,  1, {A_SkimChase}, 0, 0, S_SKIM1, 0},
-	{"S_SKIM3", 0, SPR_SKIM, 0, 14,        {NULL}, 0, 0, S_SKIM4, 0},
-	{"S_SKIM4", 0, SPR_SKIM, 0, 14,  {A_DropMine}, 0, 0, S_SKIM1, 0},
+	{"SKIM1", 0, SPR_SKIM, 0,  1, {A_SkimChase}, 0, 0, S_SKIM2, 0},
+	{"SKIM2", 0, SPR_SKIM, 0,  1, {A_SkimChase}, 0, 0, S_SKIM1, 0},
+	{"SKIM3", 0, SPR_SKIM, 0, 14,        {NULL}, 0, 0, S_SKIM4, 0},
+	{"SKIM4", 0, SPR_SKIM, 0, 14,  {A_DropMine}, 0, 0, S_SKIM1, 0},
 
 	// THZ Turret
-	{"S_TURRET", 0, SPR_TRET, FF_FULLBRIGHT, 105, {A_TurretStop}, 0, 0, S_TURRETFIRE, 0},
-	{"S_TURRETFIRE", 0, SPR_TRET, FF_FULLBRIGHT, 105, {A_TurretFire}, 0, 0, S_TURRET, 0},
-	{"S_TURRETSHOCK1", 0, SPR_TRET, FF_FULLBRIGHT|1, 7, {A_Pain}, 0, 0, S_TURRETSHOCK2, 0},
-	{"S_TURRETSHOCK2", 0, SPR_TRET, FF_FULLBRIGHT|2, 7, {NULL}, 0, 0, S_TURRETSHOCK3, 0},
-	{"S_TURRETSHOCK3", 0, SPR_TRET, FF_FULLBRIGHT|3, 7, {NULL}, 0, 0, S_TURRETSHOCK4, 0},
-	{"S_TURRETSHOCK4", 0, SPR_TRET, FF_FULLBRIGHT|4, 7, {NULL}, 0, 0, S_TURRETSHOCK5, 0},
-	{"S_TURRETSHOCK5", 0, SPR_TRET, FF_FULLBRIGHT|1, 7, {NULL}, 0, 0, S_TURRETSHOCK6, 0},
-	{"S_TURRETSHOCK6", 0, SPR_TRET, FF_FULLBRIGHT|2, 7, {A_Pain}, 0, 0, S_TURRETSHOCK7, 0},
-	{"S_TURRETSHOCK7", 0, SPR_TRET, FF_FULLBRIGHT|3, 7, {NULL}, 0, 0, S_TURRETSHOCK8, 0},
-	{"S_TURRETSHOCK8", 0, SPR_TRET, FF_FULLBRIGHT|4, 7, {NULL}, 0, 0, S_TURRETSHOCK9, 0},
-	{"S_TURRETSHOCK9", 0, SPR_TRET, FF_FULLBRIGHT|4, 7, {A_LinedefExecuteFromArg}, 0, 0, S_XPLD1, 0},
-
-	{"S_TURRETLOOK", 0, SPR_TURR, 0, 1, {A_Look}, 1, 0, S_TURRETPOPDOWN8, 0},
-	{"S_TURRETSEE", 0, SPR_TURR, 0, 0, {A_FaceTarget}, 0, 0, S_TURRETPOPUP1, 0},
-	{"S_TURRETPOPUP1", 0, SPR_TURR, 1, 2, {A_Pain}, 0, 0, S_TURRETPOPUP2, 0},
-	{"S_TURRETPOPUP2", 0, SPR_TURR, 2, 2, {NULL}, 0, 0, S_TURRETPOPUP3, 0},
-	{"S_TURRETPOPUP3", 0, SPR_TURR, 3, 2, {NULL}, 0, 0, S_TURRETPOPUP4, 0},
-	{"S_TURRETPOPUP4", 0, SPR_TURR, 4, 2, {NULL}, 0, 0, S_TURRETPOPUP5, 0},
-	{"S_TURRETPOPUP5", 0, SPR_TURR, 5, 2, {NULL}, 0, 0, S_TURRETPOPUP6, 0},
-	{"S_TURRETPOPUP6", 0, SPR_TURR, 6, 2, {NULL}, 0, 0, S_TURRETPOPUP7, 0},
-	{"S_TURRETPOPUP7", 0, SPR_TURR, 7, 2, {NULL}, 0, 0, S_TURRETPOPUP8, 0},
-	{"S_TURRETPOPUP8", 0, SPR_TURR, 8, 14,{NULL}, 0, 0, S_TURRETSHOOT, 0},
-	{"S_TURRETSHOOT", 0, SPR_TURR, 8, 14,{A_JetgShoot}, 0, 0, S_TURRETPOPDOWN1, 0},
-	{"S_TURRETPOPDOWN1", 0, SPR_TURR, 7, 2, {A_Pain}, 0, 0, S_TURRETPOPDOWN2, 0},
-	{"S_TURRETPOPDOWN2", 0, SPR_TURR, 6, 2, {NULL}, 0, 0, S_TURRETPOPDOWN3, 0},
-	{"S_TURRETPOPDOWN3", 0, SPR_TURR, 5, 2, {NULL}, 0, 0, S_TURRETPOPDOWN4, 0},
-	{"S_TURRETPOPDOWN4", 0, SPR_TURR, 4, 2, {NULL}, 0, 0, S_TURRETPOPDOWN5, 0},
-	{"S_TURRETPOPDOWN5", 0, SPR_TURR, 3, 2, {NULL}, 0, 0, S_TURRETPOPDOWN6, 0},
-	{"S_TURRETPOPDOWN6", 0, SPR_TURR, 2, 2, {NULL}, 0, 0, S_TURRETPOPDOWN7, 0},
-	{"S_TURRETPOPDOWN7", 0, SPR_TURR, 1, 2, {NULL}, 0, 0, S_TURRETPOPDOWN8, 0},
-	{"S_TURRETPOPDOWN8", 0, SPR_TURR, 0, 69,{A_SetTics}, 0, 1, S_TURRETLOOK, 0},
+	{"TURRET", 0, SPR_TRET, FF_FULLBRIGHT, 105, {A_TurretStop}, 0, 0, S_TURRETFIRE, 0},
+	{"TURRETFIRE", 0, SPR_TRET, FF_FULLBRIGHT, 105, {A_TurretFire}, 0, 0, S_TURRET, 0},
+	{"TURRETSHOCK1", 0, SPR_TRET, FF_FULLBRIGHT|1, 7, {A_Pain}, 0, 0, S_TURRETSHOCK2, 0},
+	{"TURRETSHOCK2", 0, SPR_TRET, FF_FULLBRIGHT|2, 7, {NULL}, 0, 0, S_TURRETSHOCK3, 0},
+	{"TURRETSHOCK3", 0, SPR_TRET, FF_FULLBRIGHT|3, 7, {NULL}, 0, 0, S_TURRETSHOCK4, 0},
+	{"TURRETSHOCK4", 0, SPR_TRET, FF_FULLBRIGHT|4, 7, {NULL}, 0, 0, S_TURRETSHOCK5, 0},
+	{"TURRETSHOCK5", 0, SPR_TRET, FF_FULLBRIGHT|1, 7, {NULL}, 0, 0, S_TURRETSHOCK6, 0},
+	{"TURRETSHOCK6", 0, SPR_TRET, FF_FULLBRIGHT|2, 7, {A_Pain}, 0, 0, S_TURRETSHOCK7, 0},
+	{"TURRETSHOCK7", 0, SPR_TRET, FF_FULLBRIGHT|3, 7, {NULL}, 0, 0, S_TURRETSHOCK8, 0},
+	{"TURRETSHOCK8", 0, SPR_TRET, FF_FULLBRIGHT|4, 7, {NULL}, 0, 0, S_TURRETSHOCK9, 0},
+	{"TURRETSHOCK9", 0, SPR_TRET, FF_FULLBRIGHT|4, 7, {A_LinedefExecuteFromArg}, 0, 0, S_XPLD1, 0},
+
+	{"TURRETLOOK", 0, SPR_TURR, 0, 1, {A_Look}, 1, 0, S_TURRETPOPDOWN8, 0},
+	{"TURRETSEE", 0, SPR_TURR, 0, 0, {A_FaceTarget}, 0, 0, S_TURRETPOPUP1, 0},
+	{"TURRETPOPUP1", 0, SPR_TURR, 1, 2, {A_Pain}, 0, 0, S_TURRETPOPUP2, 0},
+	{"TURRETPOPUP2", 0, SPR_TURR, 2, 2, {NULL}, 0, 0, S_TURRETPOPUP3, 0},
+	{"TURRETPOPUP3", 0, SPR_TURR, 3, 2, {NULL}, 0, 0, S_TURRETPOPUP4, 0},
+	{"TURRETPOPUP4", 0, SPR_TURR, 4, 2, {NULL}, 0, 0, S_TURRETPOPUP5, 0},
+	{"TURRETPOPUP5", 0, SPR_TURR, 5, 2, {NULL}, 0, 0, S_TURRETPOPUP6, 0},
+	{"TURRETPOPUP6", 0, SPR_TURR, 6, 2, {NULL}, 0, 0, S_TURRETPOPUP7, 0},
+	{"TURRETPOPUP7", 0, SPR_TURR, 7, 2, {NULL}, 0, 0, S_TURRETPOPUP8, 0},
+	{"TURRETPOPUP8", 0, SPR_TURR, 8, 14,{NULL}, 0, 0, S_TURRETSHOOT, 0},
+	{"TURRETSHOOT", 0, SPR_TURR, 8, 14,{A_JetgShoot}, 0, 0, S_TURRETPOPDOWN1, 0},
+	{"TURRETPOPDOWN1", 0, SPR_TURR, 7, 2, {A_Pain}, 0, 0, S_TURRETPOPDOWN2, 0},
+	{"TURRETPOPDOWN2", 0, SPR_TURR, 6, 2, {NULL}, 0, 0, S_TURRETPOPDOWN3, 0},
+	{"TURRETPOPDOWN3", 0, SPR_TURR, 5, 2, {NULL}, 0, 0, S_TURRETPOPDOWN4, 0},
+	{"TURRETPOPDOWN4", 0, SPR_TURR, 4, 2, {NULL}, 0, 0, S_TURRETPOPDOWN5, 0},
+	{"TURRETPOPDOWN5", 0, SPR_TURR, 3, 2, {NULL}, 0, 0, S_TURRETPOPDOWN6, 0},
+	{"TURRETPOPDOWN6", 0, SPR_TURR, 2, 2, {NULL}, 0, 0, S_TURRETPOPDOWN7, 0},
+	{"TURRETPOPDOWN7", 0, SPR_TURR, 1, 2, {NULL}, 0, 0, S_TURRETPOPDOWN8, 0},
+	{"TURRETPOPDOWN8", 0, SPR_TURR, 0, 69,{A_SetTics}, 0, 1, S_TURRETLOOK, 0},
 
 	// Spincushion
-	{"S_SPINCUSHION_LOOK", 0, SPR_SHRP, 0,  2, {A_Look},                 0, 0, S_SPINCUSHION_LOOK, 0},
-	{"S_SPINCUSHION_CHASE1", 0, SPR_SHRP, 1,  2, {A_SharpChase},           0, 0, S_SPINCUSHION_CHASE2, 0},
-	{"S_SPINCUSHION_CHASE2", 0, SPR_SHRP, 2,  2, {A_SharpChase},           0, 0, S_SPINCUSHION_CHASE3, 0},
-	{"S_SPINCUSHION_CHASE3", 0, SPR_SHRP, 3,  2, {A_SharpChase},           0, 0, S_SPINCUSHION_CHASE4, 0},
-	{"S_SPINCUSHION_CHASE4", 0, SPR_SHRP, 0,  2, {A_SharpChase},           0, 0, S_SPINCUSHION_CHASE1, 0},
-	{"S_SPINCUSHION_AIM1", 0, SPR_SHRP, 0,  2, {NULL},                   0, 0, S_SPINCUSHION_AIM2, 0},
-	{"S_SPINCUSHION_AIM2", 0, SPR_SHRP, 4,  2, {NULL},                   0, 0, S_SPINCUSHION_AIM3, 0},
-	{"S_SPINCUSHION_AIM3", 0, SPR_SHRP, 5,  2, {A_SetObjectFlags}, MF_PAIN, 2, S_SPINCUSHION_AIM4, 0},
-	{"S_SPINCUSHION_AIM4", 0, SPR_SHRP, 6, 16, {A_MultiShotDist}, (MT_DUST<<16)|6, -32, S_SPINCUSHION_AIM5, 0},
-	{"S_SPINCUSHION_AIM5", 0, SPR_SHRP, 6,  0, {A_PlaySound},   sfx_shrpgo, 1, S_SPINCUSHION_SPIN1, 0},
-	{"S_SPINCUSHION_SPIN1", 0, SPR_SHRP, 6,  1, {A_SharpSpin},            0, 0, S_SPINCUSHION_SPIN2, 0},
-	{"S_SPINCUSHION_SPIN2", 0, SPR_SHRP, 8,  1, {A_SharpSpin},            0, 0, S_SPINCUSHION_SPIN3, 0},
-	{"S_SPINCUSHION_SPIN3", 0, SPR_SHRP, 7,  1, {A_SharpSpin},            0, 0, S_SPINCUSHION_SPIN4, 0},
-	{"S_SPINCUSHION_SPIN4", 0, SPR_SHRP, 8,  1, {A_SharpSpin},  MT_SPINDUST, 0, S_SPINCUSHION_SPIN1, 0},
-	{"S_SPINCUSHION_STOP1", 0, SPR_SHRP, 6,  1, {A_PlaySound},    sfx_s3k69, 1, S_SPINCUSHION_STOP2, 0},
-	{"S_SPINCUSHION_STOP2", 0, SPR_SHRP, 6,  4, {A_SharpDecel},           0, 0, S_SPINCUSHION_STOP2, 0},
-	{"S_SPINCUSHION_STOP3", 0, SPR_SHRP, 5,  4, {A_FaceTarget},           0, 0, S_SPINCUSHION_STOP4, 0},
-	{"S_SPINCUSHION_STOP4", 0, SPR_SHRP, 4,  4, {A_SetObjectFlags}, MF_PAIN, 1, S_SPINCUSHION_LOOK, 0},
+	{"SPINCUSHION_LOOK", 0, SPR_SHRP, 0,  2, {A_Look},                 0, 0, S_SPINCUSHION_LOOK, 0},
+	{"SPINCUSHION_CHASE1", 0, SPR_SHRP, 1,  2, {A_SharpChase},           0, 0, S_SPINCUSHION_CHASE2, 0},
+	{"SPINCUSHION_CHASE2", 0, SPR_SHRP, 2,  2, {A_SharpChase},           0, 0, S_SPINCUSHION_CHASE3, 0},
+	{"SPINCUSHION_CHASE3", 0, SPR_SHRP, 3,  2, {A_SharpChase},           0, 0, S_SPINCUSHION_CHASE4, 0},
+	{"SPINCUSHION_CHASE4", 0, SPR_SHRP, 0,  2, {A_SharpChase},           0, 0, S_SPINCUSHION_CHASE1, 0},
+	{"SPINCUSHION_AIM1", 0, SPR_SHRP, 0,  2, {NULL},                   0, 0, S_SPINCUSHION_AIM2, 0},
+	{"SPINCUSHION_AIM2", 0, SPR_SHRP, 4,  2, {NULL},                   0, 0, S_SPINCUSHION_AIM3, 0},
+	{"SPINCUSHION_AIM3", 0, SPR_SHRP, 5,  2, {A_SetObjectFlags}, MF_PAIN, 2, S_SPINCUSHION_AIM4, 0},
+	{"SPINCUSHION_AIM4", 0, SPR_SHRP, 6, 16, {A_MultiShotDist}, (MT_DUST<<16)|6, -32, S_SPINCUSHION_AIM5, 0},
+	{"SPINCUSHION_AIM5", 0, SPR_SHRP, 6,  0, {A_PlaySound},   sfx_shrpgo, 1, S_SPINCUSHION_SPIN1, 0},
+	{"SPINCUSHION_SPIN1", 0, SPR_SHRP, 6,  1, {A_SharpSpin},            0, 0, S_SPINCUSHION_SPIN2, 0},
+	{"SPINCUSHION_SPIN2", 0, SPR_SHRP, 8,  1, {A_SharpSpin},            0, 0, S_SPINCUSHION_SPIN3, 0},
+	{"SPINCUSHION_SPIN3", 0, SPR_SHRP, 7,  1, {A_SharpSpin},            0, 0, S_SPINCUSHION_SPIN4, 0},
+	{"SPINCUSHION_SPIN4", 0, SPR_SHRP, 8,  1, {A_SharpSpin},  MT_SPINDUST, 0, S_SPINCUSHION_SPIN1, 0},
+	{"SPINCUSHION_STOP1", 0, SPR_SHRP, 6,  1, {A_PlaySound},    sfx_s3k69, 1, S_SPINCUSHION_STOP2, 0},
+	{"SPINCUSHION_STOP2", 0, SPR_SHRP, 6,  4, {A_SharpDecel},           0, 0, S_SPINCUSHION_STOP2, 0},
+	{"SPINCUSHION_STOP3", 0, SPR_SHRP, 5,  4, {A_FaceTarget},           0, 0, S_SPINCUSHION_STOP4, 0},
+	{"SPINCUSHION_STOP4", 0, SPR_SHRP, 4,  4, {A_SetObjectFlags}, MF_PAIN, 1, S_SPINCUSHION_LOOK, 0},
 
 	// Crushstacean
-	{"S_CRUSHSTACEAN_ROAM1", 0, SPR_CRAB, 0,  3, {A_CrushstaceanWalk},  0, S_CRUSHSTACEAN_ROAMPAUSE, S_CRUSHSTACEAN_ROAM2, 0},
-	{"S_CRUSHSTACEAN_ROAM2", 0, SPR_CRAB, 1,  3, {A_CrushstaceanWalk},  0, S_CRUSHSTACEAN_ROAMPAUSE, S_CRUSHSTACEAN_ROAM3, 0},
-	{"S_CRUSHSTACEAN_ROAM3", 0, SPR_CRAB, 0,  3, {A_CrushstaceanWalk},  0, S_CRUSHSTACEAN_ROAMPAUSE, S_CRUSHSTACEAN_ROAM4, 0},
-	{"S_CRUSHSTACEAN_ROAM4", 0, SPR_CRAB, 2,  3, {A_CrushstaceanWalk},  0, S_CRUSHSTACEAN_ROAMPAUSE, S_CRUSHSTACEAN_ROAM1, 0},
-	{"S_CRUSHSTACEAN_ROAMPAUSE", 0, SPR_CRAB, 0, 40, {NULL},                0,                        0, S_CRUSHSTACEAN_ROAM1, 0},
-	{"S_CRUSHSTACEAN_PUNCH1", 0, SPR_CRAB, 0, 10, {NULL},                0,                        0, S_CRUSHSTACEAN_PUNCH2, 0},
-	{"S_CRUSHSTACEAN_PUNCH2", 0, SPR_CRAB, 0, -1, {A_CrushstaceanPunch}, 0,                        0, S_CRUSHSTACEAN_ROAMPAUSE, 0},
-	{"S_CRUSHCLAW_AIM", 0, SPR_CRAB, 3,  1, {A_CrushclawAim},   40,               20, S_CRUSHCLAW_AIM, 0},
-	{"S_CRUSHCLAW_OUT", 0, SPR_CRAB, 3,  1, {A_CrushclawLaunch}, 0, S_CRUSHCLAW_STAY, S_CRUSHCLAW_OUT, 0},
-	{"S_CRUSHCLAW_STAY", 0, SPR_CRAB, 3, 10, {NULL},              0,                0, S_CRUSHCLAW_IN, 0},
-	{"S_CRUSHCLAW_IN", 0, SPR_CRAB, 3,  1, {A_CrushclawLaunch}, 1, S_CRUSHCLAW_WAIT, S_CRUSHCLAW_IN, 0},
-	{"S_CRUSHCLAW_WAIT", 0, SPR_CRAB, 3, 37, {NULL},              0,                0, S_CRUSHCLAW_AIM, 0},
-	{"S_CRUSHCHAIN", 0, SPR_CRAB, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CRUSHSTACEAN_ROAM1", 0, SPR_CRAB, 0,  3, {A_CrushstaceanWalk},  0, S_CRUSHSTACEAN_ROAMPAUSE, S_CRUSHSTACEAN_ROAM2, 0},
+	{"CRUSHSTACEAN_ROAM2", 0, SPR_CRAB, 1,  3, {A_CrushstaceanWalk},  0, S_CRUSHSTACEAN_ROAMPAUSE, S_CRUSHSTACEAN_ROAM3, 0},
+	{"CRUSHSTACEAN_ROAM3", 0, SPR_CRAB, 0,  3, {A_CrushstaceanWalk},  0, S_CRUSHSTACEAN_ROAMPAUSE, S_CRUSHSTACEAN_ROAM4, 0},
+	{"CRUSHSTACEAN_ROAM4", 0, SPR_CRAB, 2,  3, {A_CrushstaceanWalk},  0, S_CRUSHSTACEAN_ROAMPAUSE, S_CRUSHSTACEAN_ROAM1, 0},
+	{"CRUSHSTACEAN_ROAMPAUSE", 0, SPR_CRAB, 0, 40, {NULL},                0,                        0, S_CRUSHSTACEAN_ROAM1, 0},
+	{"CRUSHSTACEAN_PUNCH1", 0, SPR_CRAB, 0, 10, {NULL},                0,                        0, S_CRUSHSTACEAN_PUNCH2, 0},
+	{"CRUSHSTACEAN_PUNCH2", 0, SPR_CRAB, 0, -1, {A_CrushstaceanPunch}, 0,                        0, S_CRUSHSTACEAN_ROAMPAUSE, 0},
+	{"CRUSHCLAW_AIM", 0, SPR_CRAB, 3,  1, {A_CrushclawAim},   40,               20, S_CRUSHCLAW_AIM, 0},
+	{"CRUSHCLAW_OUT", 0, SPR_CRAB, 3,  1, {A_CrushclawLaunch}, 0, S_CRUSHCLAW_STAY, S_CRUSHCLAW_OUT, 0},
+	{"CRUSHCLAW_STAY", 0, SPR_CRAB, 3, 10, {NULL},              0,                0, S_CRUSHCLAW_IN, 0},
+	{"CRUSHCLAW_IN", 0, SPR_CRAB, 3,  1, {A_CrushclawLaunch}, 1, S_CRUSHCLAW_WAIT, S_CRUSHCLAW_IN, 0},
+	{"CRUSHCLAW_WAIT", 0, SPR_CRAB, 3, 37, {NULL},              0,                0, S_CRUSHCLAW_AIM, 0},
+	{"CRUSHCHAIN", 0, SPR_CRAB, 4, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Banpyura
-	{"S_BANPYURA_ROAM1", 0, SPR_CR2B, 0,  3, {A_CrushstaceanWalk},  0, S_BANPYURA_ROAMPAUSE, S_BANPYURA_ROAM2, 0},
-	{"S_BANPYURA_ROAM2", 0, SPR_CR2B, 1,  3, {A_CrushstaceanWalk},  0, S_BANPYURA_ROAMPAUSE, S_BANPYURA_ROAM3, 0},
-	{"S_BANPYURA_ROAM3", 0, SPR_CR2B, 0,  3, {A_CrushstaceanWalk},  0, S_BANPYURA_ROAMPAUSE, S_BANPYURA_ROAM4, 0},
-	{"S_BANPYURA_ROAM4", 0, SPR_CR2B, 2,  3, {A_CrushstaceanWalk},  0, S_BANPYURA_ROAMPAUSE, S_BANPYURA_ROAM1, 0},
-	{"S_BANPYURA_ROAMPAUSE", 0, SPR_CR2B, 0, 40, {NULL},                0,                    0, S_BANPYURA_ROAM1, 0},
-
-	{"S_CDIAG1", 0, SPR_CSPR, 0, 1, {A_CrushclawAim}, 50, 20, S_CDIAG1, 0},
-	{"S_CDIAG2", 0, SPR_CSPR, 1, 1, {A_Pain},          0,  0, S_CDIAG3, 0},
-	{"S_CDIAG3", 0, SPR_CSPR, 2, 1, {A_CrushclawAim}, 50, 20, S_CDIAG4, 0},
-	{"S_CDIAG4", 0, SPR_CSPR, 3, 1, {A_CrushclawAim}, 50, 20, S_CDIAG5, 0},
-	{"S_CDIAG5", 0, SPR_CSPR, 4, 1, {A_CrushclawAim}, 50, 20, S_CDIAG6, 0},
-	{"S_CDIAG6", 0, SPR_CSPR, 3, 1, {A_CrushclawAim}, 50, 20, S_CDIAG7, 0},
-	{"S_CDIAG7", 0, SPR_CSPR, 2, 1, {A_CrushclawAim}, 50, 20, S_CDIAG8, 0},
-	{"S_CDIAG8", 0, SPR_CSPR, 1, 1, {A_CrushclawAim}, 50, 20, S_CDIAG1, 0},
+	{"BANPYURA_ROAM1", 0, SPR_CR2B, 0,  3, {A_CrushstaceanWalk},  0, S_BANPYURA_ROAMPAUSE, S_BANPYURA_ROAM2, 0},
+	{"BANPYURA_ROAM2", 0, SPR_CR2B, 1,  3, {A_CrushstaceanWalk},  0, S_BANPYURA_ROAMPAUSE, S_BANPYURA_ROAM3, 0},
+	{"BANPYURA_ROAM3", 0, SPR_CR2B, 0,  3, {A_CrushstaceanWalk},  0, S_BANPYURA_ROAMPAUSE, S_BANPYURA_ROAM4, 0},
+	{"BANPYURA_ROAM4", 0, SPR_CR2B, 2,  3, {A_CrushstaceanWalk},  0, S_BANPYURA_ROAMPAUSE, S_BANPYURA_ROAM1, 0},
+	{"BANPYURA_ROAMPAUSE", 0, SPR_CR2B, 0, 40, {NULL},                0,                    0, S_BANPYURA_ROAM1, 0},
+
+	{"CDIAG1", 0, SPR_CSPR, 0, 1, {A_CrushclawAim}, 50, 20, S_CDIAG1, 0},
+	{"CDIAG2", 0, SPR_CSPR, 1, 1, {A_Pain},          0,  0, S_CDIAG3, 0},
+	{"CDIAG3", 0, SPR_CSPR, 2, 1, {A_CrushclawAim}, 50, 20, S_CDIAG4, 0},
+	{"CDIAG4", 0, SPR_CSPR, 3, 1, {A_CrushclawAim}, 50, 20, S_CDIAG5, 0},
+	{"CDIAG5", 0, SPR_CSPR, 4, 1, {A_CrushclawAim}, 50, 20, S_CDIAG6, 0},
+	{"CDIAG6", 0, SPR_CSPR, 3, 1, {A_CrushclawAim}, 50, 20, S_CDIAG7, 0},
+	{"CDIAG7", 0, SPR_CSPR, 2, 1, {A_CrushclawAim}, 50, 20, S_CDIAG8, 0},
+	{"CDIAG8", 0, SPR_CSPR, 1, 1, {A_CrushclawAim}, 50, 20, S_CDIAG1, 0},
 
 	// Jet Jaw
-	{"S_JETJAW_ROAM1", 0, SPR_JJAW, 0, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM2, 0},
-	{"S_JETJAW_ROAM2", 0, SPR_JJAW, 0, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM3, 0},
-	{"S_JETJAW_ROAM3", 0, SPR_JJAW, 0, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM4, 0},
-	{"S_JETJAW_ROAM4", 0, SPR_JJAW, 0, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM5, 0},
-	{"S_JETJAW_ROAM5", 0, SPR_JJAW, 1, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM6, 0},
-	{"S_JETJAW_ROAM6", 0, SPR_JJAW, 1, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM7, 0},
-	{"S_JETJAW_ROAM7", 0, SPR_JJAW, 1, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM8, 0},
-	{"S_JETJAW_ROAM8", 0, SPR_JJAW, 1, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM1, 0},
-	{"S_JETJAW_CHOMP1", 0, SPR_JJAW, 0, 1, {A_DualAction}, S_JETJAW_CHOMP16, S_JETJAW_SOUND,  S_JETJAW_CHOMP2, 0},
-	{"S_JETJAW_CHOMP2", 0, SPR_JJAW, 0, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP3, 0},
-	{"S_JETJAW_CHOMP3", 0, SPR_JJAW, 0, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP4, 0},
-	{"S_JETJAW_CHOMP4", 0, SPR_JJAW, 0, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP5, 0},
-	{"S_JETJAW_CHOMP5", 0, SPR_JJAW, 1, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP6, 0},
-	{"S_JETJAW_CHOMP6", 0, SPR_JJAW, 1, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP7, 0},
-	{"S_JETJAW_CHOMP7", 0, SPR_JJAW, 1, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP8, 0},
-	{"S_JETJAW_CHOMP8", 0, SPR_JJAW, 1, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP9, 0},
-	{"S_JETJAW_CHOMP9", 0, SPR_JJAW, 2, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP10, 0},
-	{"S_JETJAW_CHOMP10", 0, SPR_JJAW, 2, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP11, 0},
-	{"S_JETJAW_CHOMP11", 0, SPR_JJAW, 2, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP12, 0},
-	{"S_JETJAW_CHOMP12", 0, SPR_JJAW, 2, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP13, 0},
-	{"S_JETJAW_CHOMP13", 0, SPR_JJAW, 3, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP14, 0},
-	{"S_JETJAW_CHOMP14", 0, SPR_JJAW, 3, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP15, 0},
-	{"S_JETJAW_CHOMP15", 0, SPR_JJAW, 3, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP16, 0},
-	{"S_JETJAW_CHOMP16", 0, SPR_JJAW, 3, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP1, 0},
-	{"S_JETJAW_SOUND", 0, SPR_JJAW, 0, 1, {A_PlayAttackSound},          0,               0,   S_JETJAW_SOUND, 0},
+	{"JETJAW_ROAM1", 0, SPR_JJAW, 0, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM2, 0},
+	{"JETJAW_ROAM2", 0, SPR_JJAW, 0, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM3, 0},
+	{"JETJAW_ROAM3", 0, SPR_JJAW, 0, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM4, 0},
+	{"JETJAW_ROAM4", 0, SPR_JJAW, 0, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM5, 0},
+	{"JETJAW_ROAM5", 0, SPR_JJAW, 1, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM6, 0},
+	{"JETJAW_ROAM6", 0, SPR_JJAW, 1, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM7, 0},
+	{"JETJAW_ROAM7", 0, SPR_JJAW, 1, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM8, 0},
+	{"JETJAW_ROAM8", 0, SPR_JJAW, 1, 1, {A_JetJawRoam},               0,               0,   S_JETJAW_ROAM1, 0},
+	{"JETJAW_CHOMP1", 0, SPR_JJAW, 0, 1, {A_DualAction}, S_JETJAW_CHOMP16, S_JETJAW_SOUND,  S_JETJAW_CHOMP2, 0},
+	{"JETJAW_CHOMP2", 0, SPR_JJAW, 0, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP3, 0},
+	{"JETJAW_CHOMP3", 0, SPR_JJAW, 0, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP4, 0},
+	{"JETJAW_CHOMP4", 0, SPR_JJAW, 0, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP5, 0},
+	{"JETJAW_CHOMP5", 0, SPR_JJAW, 1, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP6, 0},
+	{"JETJAW_CHOMP6", 0, SPR_JJAW, 1, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP7, 0},
+	{"JETJAW_CHOMP7", 0, SPR_JJAW, 1, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP8, 0},
+	{"JETJAW_CHOMP8", 0, SPR_JJAW, 1, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP9, 0},
+	{"JETJAW_CHOMP9", 0, SPR_JJAW, 2, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP10, 0},
+	{"JETJAW_CHOMP10", 0, SPR_JJAW, 2, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP11, 0},
+	{"JETJAW_CHOMP11", 0, SPR_JJAW, 2, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP12, 0},
+	{"JETJAW_CHOMP12", 0, SPR_JJAW, 2, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP13, 0},
+	{"JETJAW_CHOMP13", 0, SPR_JJAW, 3, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP14, 0},
+	{"JETJAW_CHOMP14", 0, SPR_JJAW, 3, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP15, 0},
+	{"JETJAW_CHOMP15", 0, SPR_JJAW, 3, 1, {A_JetJawChomp},              0,               0, S_JETJAW_CHOMP16, 0},
+	{"JETJAW_CHOMP16", 0, SPR_JJAW, 3, 1, {A_JetJawChomp},              0,               0,  S_JETJAW_CHOMP1, 0},
+	{"JETJAW_SOUND", 0, SPR_JJAW, 0, 1, {A_PlayAttackSound},          0,               0,   S_JETJAW_SOUND, 0},
 
 	// Snailer
-	{"S_SNAILER1", 0, SPR_SNLR, 0, 1, {A_SnailerThink}, 0, 0, S_SNAILER1, 0},
-	{"S_SNAILER_FLICKY", 0, SPR_BOM1, 0, 0, {A_FlickySpawn}, 1<<17, 0, S_XPLD1, 0},
+	{"SNAILER1", 0, SPR_SNLR, 0, 1, {A_SnailerThink}, 0, 0, S_SNAILER1, 0},
+	{"SNAILER_FLICKY", 0, SPR_BOM1, 0, 0, {A_FlickySpawn}, 1<<17, 0, S_XPLD1, 0},
 
 	// Vulture
-	{"S_VULTURE_STND", 0, SPR_VLTR, 4, 35,        {A_Look},         1, 0, S_VULTURE_STND, 0},
-	{"S_VULTURE_DRIFT", 0, SPR_VLTR, 4, 3,         {A_VultureHover}, 0, 0, S_VULTURE_DRIFT, 0},
-	{"S_VULTURE_ZOOM1", 0, SPR_VLTR, 0, 6,         {A_VultureBlast}, 0, 0, S_VULTURE_ZOOM2, 0},
-	{"S_VULTURE_ZOOM2", 0, SPR_VLTR, 0, 3,         {A_VultureFly},   0, 0, S_VULTURE_ZOOM2, 0},
-	{"S_VULTURE_STUNNED", 0, SPR_VLTR, 0, 3*TICRATE, {NULL},           0, 0, S_VULTURE_DRIFT, 0},
+	{"VULTURE_STND", 0, SPR_VLTR, 4, 35,        {A_Look},         1, 0, S_VULTURE_STND, 0},
+	{"VULTURE_DRIFT", 0, SPR_VLTR, 4, 3,         {A_VultureHover}, 0, 0, S_VULTURE_DRIFT, 0},
+	{"VULTURE_ZOOM1", 0, SPR_VLTR, 0, 6,         {A_VultureBlast}, 0, 0, S_VULTURE_ZOOM2, 0},
+	{"VULTURE_ZOOM2", 0, SPR_VLTR, 0, 3,         {A_VultureFly},   0, 0, S_VULTURE_ZOOM2, 0},
+	{"VULTURE_STUNNED", 0, SPR_VLTR, 0, 3*TICRATE, {NULL},           0, 0, S_VULTURE_DRIFT, 0},
 
 	// Pointy
-	{"S_POINTY1", 0, SPR_PNTY, 0,  1, {A_PointyThink}, 0, 0, S_POINTY1, 0},
+	{"POINTY1", 0, SPR_PNTY, 0,  1, {A_PointyThink}, 0, 0, S_POINTY1, 0},
 
 	// Pointy Ball
-	{"S_POINTYBALL1", 0, SPR_PNTY, 1,  1, {A_CheckBuddy}, 0, 0, S_POINTYBALL1, 0},
+	{"POINTYBALL1", 0, SPR_PNTY, 1,  1, {A_CheckBuddy}, 0, 0, S_POINTYBALL1, 0},
 
 	// Robo-Hood
-	{"S_ROBOHOOD_LOOK", 0, SPR_ARCH, 0,       4,            {A_Look}, 2048<<FRACBITS,   0, S_ROBOHOOD_LOOK, 0},
-	{"S_ROBOHOOD_STAND", 0, SPR_ARCH, 0,       1,       {A_HoodThink},              0,   0, S_ROBOHOOD_STAND, 0},
-	{"S_ROBOHOOD_FIRE1", 0, SPR_ARCH, 2, TICRATE, {A_PlayActiveSound},              0,   0, S_ROBOHOOD_FIRE2, 0},
-	{"S_ROBOHOOD_FIRE2", 0, SPR_ARCH, 2,      20,        {A_HoodFire},       MT_ARROW,   0, S_ROBOHOOD_STAND, 0},
-	{"S_ROBOHOOD_JUMP1", 0, SPR_ARCH, 1,       1,      {A_FaceTarget},              0,   0, S_ROBOHOOD_JUMP2, 0},
-	{"S_ROBOHOOD_JUMP2", 0, SPR_ARCH, 1,       1,        {A_BunnyHop},              4, -10, S_ROBOHOOD_JUMP3, 0},
-	{"S_ROBOHOOD_JUMP3", 0, SPR_ARCH, 1,       1,        {A_HoodFall},              0,   0, S_ROBOHOOD_JUMP3, 0},
+	{"ROBOHOOD_LOOK", 0, SPR_ARCH, 0,       4,            {A_Look}, 2048<<FRACBITS,   0, S_ROBOHOOD_LOOK, 0},
+	{"ROBOHOOD_STAND", 0, SPR_ARCH, 0,       1,       {A_HoodThink},              0,   0, S_ROBOHOOD_STAND, 0},
+	{"ROBOHOOD_FIRE1", 0, SPR_ARCH, 2, TICRATE, {A_PlayActiveSound},              0,   0, S_ROBOHOOD_FIRE2, 0},
+	{"ROBOHOOD_FIRE2", 0, SPR_ARCH, 2,      20,        {A_HoodFire},       MT_ARROW,   0, S_ROBOHOOD_STAND, 0},
+	{"ROBOHOOD_JUMP1", 0, SPR_ARCH, 1,       1,      {A_FaceTarget},              0,   0, S_ROBOHOOD_JUMP2, 0},
+	{"ROBOHOOD_JUMP2", 0, SPR_ARCH, 1,       1,        {A_BunnyHop},              4, -10, S_ROBOHOOD_JUMP3, 0},
+	{"ROBOHOOD_JUMP3", 0, SPR_ARCH, 1,       1,        {A_HoodFall},              0,   0, S_ROBOHOOD_JUMP3, 0},
 
 	// Castlebot Facestabber
-	{"S_FACESTABBER_STND1", 0, SPR_CBFS, 0,  1,        {A_Chase},  0, 0, S_FACESTABBER_STND2, 0},
-	{"S_FACESTABBER_STND2", 0, SPR_CBFS, 1,  1,        {A_Chase},  0, 0, S_FACESTABBER_STND3, 0},
-	{"S_FACESTABBER_STND3", 0, SPR_CBFS, 2,  1,        {A_Chase},  0, 0, S_FACESTABBER_STND4, 0},
-	{"S_FACESTABBER_STND4", 0, SPR_CBFS, 3,  1,        {A_Chase},  0, 0, S_FACESTABBER_STND5, 0},
-	{"S_FACESTABBER_STND5", 0, SPR_CBFS, 4,  1,        {A_Chase},  0, 0, S_FACESTABBER_STND6, 0},
-	{"S_FACESTABBER_STND6", 0, SPR_CBFS, 5,  1,        {A_Chase},  0, 0, S_FACESTABBER_STND1, 0},
-	{"S_FACESTABBER_CHARGE1", 0, SPR_CBFS, 0,  1,  {A_FaceStabRev},                  20, S_FACESTABBER_CHARGE2, S_FACESTABBER_CHARGE1, 0},
-	{"S_FACESTABBER_CHARGE2", 0, SPR_CBFS, 0,  0,   {A_FaceTarget},                   0,                     0, S_FACESTABBER_CHARGE3, 0},
-	{"S_FACESTABBER_CHARGE3", 0, SPR_CBFS, 7,  1, {A_FaceStabHurl},                   6, S_FACESTABBER_CHARGE4, S_FACESTABBER_CHARGE3, 0},
-	{"S_FACESTABBER_CHARGE4", 0, SPR_CBFS, 7,  1, {A_FaceStabMiss}, 0,   S_FACESTABBER_STND1, S_FACESTABBER_CHARGE4, 0},
-	{"S_FACESTABBER_PAIN", 0, SPR_CBFS, 0, 35,         {A_Pain}, 0,                     0, S_FACESTABBER_STND1, 0},
-	{"S_FACESTABBER_DIE1", 0, SPR_CBFS, 0,  2,   {A_BossScream}, 1, 0, S_FACESTABBER_DIE2, 0},
-	{"S_FACESTABBER_DIE2", 0, SPR_NULL, 0,  2,   {A_BossScream}, 1, 0, S_FACESTABBER_DIE3, 0},
-	{"S_FACESTABBER_DIE3", 0, SPR_NULL, 0,  0,       {A_Repeat}, 7, S_FACESTABBER_DIE1,    S_XPLD_FLICKY, 0},
-
-	{"S_FACESTABBERSPEAR", 0, SPR_STAB, FF_PAPERSPRITE|FF_TRANS50|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"FACESTABBER_STND1", 0, SPR_CBFS, 0,  1,        {A_Chase},  0, 0, S_FACESTABBER_STND2, 0},
+	{"FACESTABBER_STND2", 0, SPR_CBFS, 1,  1,        {A_Chase},  0, 0, S_FACESTABBER_STND3, 0},
+	{"FACESTABBER_STND3", 0, SPR_CBFS, 2,  1,        {A_Chase},  0, 0, S_FACESTABBER_STND4, 0},
+	{"FACESTABBER_STND4", 0, SPR_CBFS, 3,  1,        {A_Chase},  0, 0, S_FACESTABBER_STND5, 0},
+	{"FACESTABBER_STND5", 0, SPR_CBFS, 4,  1,        {A_Chase},  0, 0, S_FACESTABBER_STND6, 0},
+	{"FACESTABBER_STND6", 0, SPR_CBFS, 5,  1,        {A_Chase},  0, 0, S_FACESTABBER_STND1, 0},
+	{"FACESTABBER_CHARGE1", 0, SPR_CBFS, 0,  1,  {A_FaceStabRev},                  20, S_FACESTABBER_CHARGE2, S_FACESTABBER_CHARGE1, 0},
+	{"FACESTABBER_CHARGE2", 0, SPR_CBFS, 0,  0,   {A_FaceTarget},                   0,                     0, S_FACESTABBER_CHARGE3, 0},
+	{"FACESTABBER_CHARGE3", 0, SPR_CBFS, 7,  1, {A_FaceStabHurl},                   6, S_FACESTABBER_CHARGE4, S_FACESTABBER_CHARGE3, 0},
+	{"FACESTABBER_CHARGE4", 0, SPR_CBFS, 7,  1, {A_FaceStabMiss}, 0,   S_FACESTABBER_STND1, S_FACESTABBER_CHARGE4, 0},
+	{"FACESTABBER_PAIN", 0, SPR_CBFS, 0, 35,         {A_Pain}, 0,                     0, S_FACESTABBER_STND1, 0},
+	{"FACESTABBER_DIE1", 0, SPR_CBFS, 0,  2,   {A_BossScream}, 1, 0, S_FACESTABBER_DIE2, 0},
+	{"FACESTABBER_DIE2", 0, SPR_NULL, 0,  2,   {A_BossScream}, 1, 0, S_FACESTABBER_DIE3, 0},
+	{"FACESTABBER_DIE3", 0, SPR_NULL, 0,  0,       {A_Repeat}, 7, S_FACESTABBER_DIE1,    S_XPLD_FLICKY, 0},
+
+	{"FACESTABBERSPEAR", 0, SPR_STAB, FF_PAPERSPRITE|FF_TRANS50|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Egg Guard
-	{"S_EGGGUARD_STND", 0, SPR_SPSH,  0,  1,       {A_Look}, 0, 0, S_EGGGUARD_STND, 0},
-	{"S_EGGGUARD_WALK1", 0, SPR_SPSH,  1,  3, {A_GuardChase}, 0, 0, S_EGGGUARD_WALK2, 0},
-	{"S_EGGGUARD_WALK2", 0, SPR_SPSH,  2,  3, {A_GuardChase}, 0, 0, S_EGGGUARD_WALK3, 0},
-	{"S_EGGGUARD_WALK3", 0, SPR_SPSH,  3,  3, {A_GuardChase}, 0, 0, S_EGGGUARD_WALK4, 0},
-	{"S_EGGGUARD_WALK4", 0, SPR_SPSH,  4,  3, {A_GuardChase}, 0, 0, S_EGGGUARD_WALK1, 0},
-	{"S_EGGGUARD_MAD1", 0, SPR_SPSH,  5,  5,         {NULL}, 0, 0, S_EGGGUARD_MAD2, 0},
-	{"S_EGGGUARD_MAD2", 0, SPR_SPSH,  6,  5,         {NULL}, 0, 0, S_EGGGUARD_MAD3, 0},
-	{"S_EGGGUARD_MAD3", 0, SPR_SPSH,  7, 15,         {NULL}, 0, 0, S_EGGGUARD_RUN1, 0},
-	{"S_EGGGUARD_RUN1", 0, SPR_SPSH,  8,  1, {A_GuardChase}, 0, 0, S_EGGGUARD_RUN2, 0},
-	{"S_EGGGUARD_RUN2", 0, SPR_SPSH,  9,  1, {A_GuardChase}, 0, 0, S_EGGGUARD_RUN3, 0},
-	{"S_EGGGUARD_RUN3", 0, SPR_SPSH, 10,  1, {A_GuardChase}, 0, 0, S_EGGGUARD_RUN4, 0},
-	{"S_EGGGUARD_RUN4", 0, SPR_SPSH, 11,  1, {A_GuardChase}, 0, 0, S_EGGGUARD_RUN1, 0},
-
-	{"S_EGGSHIELD", 0, SPR_ESHI, 0, 8, {A_EggShield}, 0, 0, S_EGGSHIELD, 0},
-	{"S_EGGSHIELDBREAK", 0, SPR_ESHI, 0, TICRATE/2, {NULL}, 0, 0, S_NULL, 0},
+	{"EGGGUARD_STND", 0, SPR_SPSH,  0,  1,       {A_Look}, 0, 0, S_EGGGUARD_STND, 0},
+	{"EGGGUARD_WALK1", 0, SPR_SPSH,  1,  3, {A_GuardChase}, 0, 0, S_EGGGUARD_WALK2, 0},
+	{"EGGGUARD_WALK2", 0, SPR_SPSH,  2,  3, {A_GuardChase}, 0, 0, S_EGGGUARD_WALK3, 0},
+	{"EGGGUARD_WALK3", 0, SPR_SPSH,  3,  3, {A_GuardChase}, 0, 0, S_EGGGUARD_WALK4, 0},
+	{"EGGGUARD_WALK4", 0, SPR_SPSH,  4,  3, {A_GuardChase}, 0, 0, S_EGGGUARD_WALK1, 0},
+	{"EGGGUARD_MAD1", 0, SPR_SPSH,  5,  5,         {NULL}, 0, 0, S_EGGGUARD_MAD2, 0},
+	{"EGGGUARD_MAD2", 0, SPR_SPSH,  6,  5,         {NULL}, 0, 0, S_EGGGUARD_MAD3, 0},
+	{"EGGGUARD_MAD3", 0, SPR_SPSH,  7, 15,         {NULL}, 0, 0, S_EGGGUARD_RUN1, 0},
+	{"EGGGUARD_RUN1", 0, SPR_SPSH,  8,  1, {A_GuardChase}, 0, 0, S_EGGGUARD_RUN2, 0},
+	{"EGGGUARD_RUN2", 0, SPR_SPSH,  9,  1, {A_GuardChase}, 0, 0, S_EGGGUARD_RUN3, 0},
+	{"EGGGUARD_RUN3", 0, SPR_SPSH, 10,  1, {A_GuardChase}, 0, 0, S_EGGGUARD_RUN4, 0},
+	{"EGGGUARD_RUN4", 0, SPR_SPSH, 11,  1, {A_GuardChase}, 0, 0, S_EGGGUARD_RUN1, 0},
+
+	{"EGGSHIELD", 0, SPR_ESHI, 0, 8, {A_EggShield}, 0, 0, S_EGGSHIELD, 0},
+	{"EGGSHIELDBREAK", 0, SPR_ESHI, 0, TICRATE/2, {NULL}, 0, 0, S_NULL, 0},
 
 	// Green Snapper
-	{"S_SNAPPER_SPAWN", 0, SPR_GSNP, 0, TICRATE, {NULL},             0,              0,               S_SNAPPER_SPAWN2, 0},
-	{"S_SNAPPER_SPAWN2", 0, SPR_GSNP, 0, 2,       {A_SnapperSpawn},   MT_SNAPPER_LEG, MT_SNAPPER_HEAD, S_GSNAPPER_STND, 0},
-	{"S_GSNAPPER_STND", 0, SPR_GSNP, 0, 1,       {A_SnapperThinker}, 0,              0,               S_GSNAPPER_STND, 0},
-	{"S_GSNAPPER1", 0, SPR_GSNP, 0, 2,       {A_Chase},          0,              0,               S_GSNAPPER2, 0},
-	{"S_GSNAPPER2", 0, SPR_GSNP, 1, 2,       {A_Chase},          0,              0,               S_GSNAPPER3, 0},
-	{"S_GSNAPPER3", 0, SPR_GSNP, 2, 2,       {A_Chase},          0,              0,               S_GSNAPPER4, 0},
-	{"S_GSNAPPER4", 0, SPR_GSNP, 3, 2,       {A_Chase},          0,              0,               S_GSNAPPER1, 0},
-	{"S_SNAPPER_XPLD", 0, SPR_GSNP, 0, 0,       {A_KillSegments},   0,              0,               S_XPLD_FLICKY, 0},
-	{"S_SNAPPER_LEG", 0, SPR_GSNL, 0, -1,      {NULL},             0,              0,               S_NULL, 0},
-	{"S_SNAPPER_LEGRAISE", 0, SPR_GSNL, 1, -1,      {NULL},             0,              0,               S_NULL, 0},
-	{"S_SNAPPER_HEAD", 0, SPR_GSNH, 0, -1,      {NULL},             0,              0,               S_NULL, 0},
+	{"SNAPPER_SPAWN", 0, SPR_GSNP, 0, TICRATE, {NULL},             0,              0,               S_SNAPPER_SPAWN2, 0},
+	{"SNAPPER_SPAWN2", 0, SPR_GSNP, 0, 2,       {A_SnapperSpawn},   MT_SNAPPER_LEG, MT_SNAPPER_HEAD, S_GSNAPPER_STND, 0},
+	{"GSNAPPER_STND", 0, SPR_GSNP, 0, 1,       {A_SnapperThinker}, 0,              0,               S_GSNAPPER_STND, 0},
+	{"GSNAPPER1", 0, SPR_GSNP, 0, 2,       {A_Chase},          0,              0,               S_GSNAPPER2, 0},
+	{"GSNAPPER2", 0, SPR_GSNP, 1, 2,       {A_Chase},          0,              0,               S_GSNAPPER3, 0},
+	{"GSNAPPER3", 0, SPR_GSNP, 2, 2,       {A_Chase},          0,              0,               S_GSNAPPER4, 0},
+	{"GSNAPPER4", 0, SPR_GSNP, 3, 2,       {A_Chase},          0,              0,               S_GSNAPPER1, 0},
+	{"SNAPPER_XPLD", 0, SPR_GSNP, 0, 0,       {A_KillSegments},   0,              0,               S_XPLD_FLICKY, 0},
+	{"SNAPPER_LEG", 0, SPR_GSNL, 0, -1,      {NULL},             0,              0,               S_NULL, 0},
+	{"SNAPPER_LEGRAISE", 0, SPR_GSNL, 1, -1,      {NULL},             0,              0,               S_NULL, 0},
+	{"SNAPPER_HEAD", 0, SPR_GSNH, 0, -1,      {NULL},             0,              0,               S_NULL, 0},
 
 	// Minus
-	{"S_MINUS_INIT", 0, SPR_MNUD, 0,            1,  {NULL},           0, 0, S_MINUS_STND, 0}, // (required for objectplace to work)
-	{"S_MINUS_STND", 0, SPR_NULL, 0,            10, {A_Look},         0, 0, S_MINUS_STND, 0},
-	{"S_MINUS_DIGGING1", 0, SPR_NULL, 0,            1,  {A_MinusDigging}, 1, 0, S_MINUS_DIGGING2, 0},
-	{"S_MINUS_DIGGING2", 0, SPR_NULL, 0,            1,  {A_MinusDigging}, 0, 0, S_MINUS_DIGGING3, 0},
-	{"S_MINUS_DIGGING3", 0, SPR_NULL, 0,            1,  {A_MinusDigging}, 0, 0, S_MINUS_DIGGING4, 0},
-	{"S_MINUS_DIGGING4", 0, SPR_NULL, 0,            1,  {A_MinusDigging}, 0, 0, S_MINUS_DIGGING1, 0},
-	{"S_MINUS_BURST0", 0, SPR_NULL, 0,            25, {NULL},           0, 0, S_MINUS_POPUP, 0},
-	{"S_MINUS_BURST1", 0, SPR_MNUD, FF_ANIMATE,   5,  {NULL},           1, 2, S_MINUS_BURST2, 0},
-	{"S_MINUS_BURST2", 0, SPR_MNUD, 1|FF_ANIMATE, 5,  {NULL},           1, 2, S_MINUS_BURST3, 0},
-	{"S_MINUS_BURST3", 0, SPR_MNUD, 2|FF_ANIMATE, 5,  {NULL},           1, 2, S_MINUS_BURST4, 0},
-	{"S_MINUS_BURST4", 0, SPR_MNUD, 3|FF_ANIMATE, 5,  {NULL},           1, 2, S_MINUS_BURST5, 0},
-	{"S_MINUS_BURST5", 0, SPR_MNUD, 4|FF_ANIMATE, 5,  {NULL},           1, 2, S_MINUSDIRT2, 0},
-	{"S_MINUS_POPUP", 0, SPR_MNUS, 3, 1, {A_MinusPopup}, 0, 0, S_MINUS_AERIAL1, 0},
-	{"S_MINUS_AERIAL1", 0, SPR_MNUS, 0, 1, {A_MinusCheck}, 0, 1, S_MINUS_AERIAL2, 0},
-	{"S_MINUS_AERIAL2", 0, SPR_MNUS, 1, 1, {A_MinusCheck}, 0, 1, S_MINUS_AERIAL3, 0},
-	{"S_MINUS_AERIAL3", 0, SPR_MNUS, 2, 1, {A_MinusCheck}, 0, 1, S_MINUS_AERIAL4, 0},
-	{"S_MINUS_AERIAL4", 0, SPR_MNUS, 3, 1, {A_MinusCheck}, 0, 1, S_MINUS_AERIAL1, 0},
-
-	{"S_MINUSDIRT1", 0, SPR_MNUD, FF_ANIMATE, 6, {NULL}, 1, 5, S_MINUSDIRT2, 0},
-	{"S_MINUSDIRT2", 0, SPR_MNUD, 5,          8, {NULL}, 3, 5, S_MINUSDIRT3, 0},
-	{"S_MINUSDIRT3", 0, SPR_MNUD, 4,          8, {NULL}, 3, 5, S_MINUSDIRT4, 0},
-	{"S_MINUSDIRT4", 0, SPR_MNUD, 3,          8, {NULL}, 3, 5, S_MINUSDIRT5, 0},
-	{"S_MINUSDIRT5", 0, SPR_MNUD, 2,          8, {NULL}, 3, 5, S_MINUSDIRT6, 0},
-	{"S_MINUSDIRT6", 0, SPR_MNUD, 1,          8, {NULL}, 3, 5, S_MINUSDIRT7, 0},
-	{"S_MINUSDIRT7", 0, SPR_MNUD, 0,          8, {NULL}, 3, 5, S_NULL, 0},
+	{"MINUS_INIT", 0, SPR_MNUD, 0,            1,  {NULL},           0, 0, S_MINUS_STND, 0}, // (required for objectplace to work)
+	{"MINUS_STND", 0, SPR_NULL, 0,            10, {A_Look},         0, 0, S_MINUS_STND, 0},
+	{"MINUS_DIGGING1", 0, SPR_NULL, 0,            1,  {A_MinusDigging}, 1, 0, S_MINUS_DIGGING2, 0},
+	{"MINUS_DIGGING2", 0, SPR_NULL, 0,            1,  {A_MinusDigging}, 0, 0, S_MINUS_DIGGING3, 0},
+	{"MINUS_DIGGING3", 0, SPR_NULL, 0,            1,  {A_MinusDigging}, 0, 0, S_MINUS_DIGGING4, 0},
+	{"MINUS_DIGGING4", 0, SPR_NULL, 0,            1,  {A_MinusDigging}, 0, 0, S_MINUS_DIGGING1, 0},
+	{"MINUS_BURST0", 0, SPR_NULL, 0,            25, {NULL},           0, 0, S_MINUS_POPUP, 0},
+	{"MINUS_BURST1", 0, SPR_MNUD, FF_ANIMATE,   5,  {NULL},           1, 2, S_MINUS_BURST2, 0},
+	{"MINUS_BURST2", 0, SPR_MNUD, 1|FF_ANIMATE, 5,  {NULL},           1, 2, S_MINUS_BURST3, 0},
+	{"MINUS_BURST3", 0, SPR_MNUD, 2|FF_ANIMATE, 5,  {NULL},           1, 2, S_MINUS_BURST4, 0},
+	{"MINUS_BURST4", 0, SPR_MNUD, 3|FF_ANIMATE, 5,  {NULL},           1, 2, S_MINUS_BURST5, 0},
+	{"MINUS_BURST5", 0, SPR_MNUD, 4|FF_ANIMATE, 5,  {NULL},           1, 2, S_MINUSDIRT2, 0},
+	{"MINUS_POPUP", 0, SPR_MNUS, 3, 1, {A_MinusPopup}, 0, 0, S_MINUS_AERIAL1, 0},
+	{"MINUS_AERIAL1", 0, SPR_MNUS, 0, 1, {A_MinusCheck}, 0, 1, S_MINUS_AERIAL2, 0},
+	{"MINUS_AERIAL2", 0, SPR_MNUS, 1, 1, {A_MinusCheck}, 0, 1, S_MINUS_AERIAL3, 0},
+	{"MINUS_AERIAL3", 0, SPR_MNUS, 2, 1, {A_MinusCheck}, 0, 1, S_MINUS_AERIAL4, 0},
+	{"MINUS_AERIAL4", 0, SPR_MNUS, 3, 1, {A_MinusCheck}, 0, 1, S_MINUS_AERIAL1, 0},
+
+	{"MINUSDIRT1", 0, SPR_MNUD, FF_ANIMATE, 6, {NULL}, 1, 5, S_MINUSDIRT2, 0},
+	{"MINUSDIRT2", 0, SPR_MNUD, 5,          8, {NULL}, 3, 5, S_MINUSDIRT3, 0},
+	{"MINUSDIRT3", 0, SPR_MNUD, 4,          8, {NULL}, 3, 5, S_MINUSDIRT4, 0},
+	{"MINUSDIRT4", 0, SPR_MNUD, 3,          8, {NULL}, 3, 5, S_MINUSDIRT5, 0},
+	{"MINUSDIRT5", 0, SPR_MNUD, 2,          8, {NULL}, 3, 5, S_MINUSDIRT6, 0},
+	{"MINUSDIRT6", 0, SPR_MNUD, 1,          8, {NULL}, 3, 5, S_MINUSDIRT7, 0},
+	{"MINUSDIRT7", 0, SPR_MNUD, 0,          8, {NULL}, 3, 5, S_NULL, 0},
 
 	// Spring Shell
-	{"S_SSHELL_STND", 0, SPR_SSHL,  0,  4, {A_Look},  0, 0, S_SSHELL_STND, 0},
-	{"S_SSHELL_RUN1", 0, SPR_SSHL,  0,  4, {A_Chase}, 0, 0, S_SSHELL_RUN2, 0},
-	{"S_SSHELL_RUN2", 0, SPR_SSHL,  1,  4, {A_Chase}, 0, 0, S_SSHELL_RUN3, 0},
-	{"S_SSHELL_RUN3", 0, SPR_SSHL,  2,  4, {A_Chase}, 0, 0, S_SSHELL_RUN4, 0},
-	{"S_SSHELL_RUN4", 0, SPR_SSHL,  3,  4, {A_Chase}, 0, 0, S_SSHELL_RUN1, 0},
-	{"S_SSHELL_SPRING1", 0, SPR_SSHL,  7,  4, {A_Pain},  0, 0, S_SSHELL_SPRING2, 0},
-	{"S_SSHELL_SPRING2", 0, SPR_SSHL,  6,  1, {NULL},    0, 0, S_SSHELL_SPRING3, 0},
-	{"S_SSHELL_SPRING3", 0, SPR_SSHL,  5,  1, {NULL},    0, 0, S_SSHELL_SPRING4, 0},
-	{"S_SSHELL_SPRING4", 0, SPR_SSHL,  4,  1, {NULL},    0, 0, S_SSHELL_RUN1, 0},
+	{"SSHELL_STND", 0, SPR_SSHL,  0,  4, {A_Look},  0, 0, S_SSHELL_STND, 0},
+	{"SSHELL_RUN1", 0, SPR_SSHL,  0,  4, {A_Chase}, 0, 0, S_SSHELL_RUN2, 0},
+	{"SSHELL_RUN2", 0, SPR_SSHL,  1,  4, {A_Chase}, 0, 0, S_SSHELL_RUN3, 0},
+	{"SSHELL_RUN3", 0, SPR_SSHL,  2,  4, {A_Chase}, 0, 0, S_SSHELL_RUN4, 0},
+	{"SSHELL_RUN4", 0, SPR_SSHL,  3,  4, {A_Chase}, 0, 0, S_SSHELL_RUN1, 0},
+	{"SSHELL_SPRING1", 0, SPR_SSHL,  7,  4, {A_Pain},  0, 0, S_SSHELL_SPRING2, 0},
+	{"SSHELL_SPRING2", 0, SPR_SSHL,  6,  1, {NULL},    0, 0, S_SSHELL_SPRING3, 0},
+	{"SSHELL_SPRING3", 0, SPR_SSHL,  5,  1, {NULL},    0, 0, S_SSHELL_SPRING4, 0},
+	{"SSHELL_SPRING4", 0, SPR_SSHL,  4,  1, {NULL},    0, 0, S_SSHELL_RUN1, 0},
 
 	// Spring Shell (yellow)
-	{"S_YSHELL_STND", 0, SPR_SSHL,  8,  4, {A_Look},  0, 0, S_YSHELL_STND, 0},
-	{"S_YSHELL_RUN1", 0, SPR_SSHL,  8,  4, {A_Chase}, 0, 0, S_YSHELL_RUN2, 0},
-	{"S_YSHELL_RUN2", 0, SPR_SSHL,  9,  4, {A_Chase}, 0, 0, S_YSHELL_RUN3, 0},
-	{"S_YSHELL_RUN3", 0, SPR_SSHL, 10,  4, {A_Chase}, 0, 0, S_YSHELL_RUN4, 0},
-	{"S_YSHELL_RUN4", 0, SPR_SSHL, 11,  4, {A_Chase}, 0, 0, S_YSHELL_RUN1, 0},
-	{"S_YSHELL_SPRING1", 0, SPR_SSHL, 15,  4, {A_Pain},  0, 0, S_YSHELL_SPRING2, 0},
-	{"S_YSHELL_SPRING2", 0, SPR_SSHL, 14,  1, {NULL},    0, 0, S_YSHELL_SPRING3, 0},
-	{"S_YSHELL_SPRING3", 0, SPR_SSHL, 13,  1, {NULL},    0, 0, S_YSHELL_SPRING4, 0},
-	{"S_YSHELL_SPRING4", 0, SPR_SSHL, 12,  1, {NULL},    0, 0, S_YSHELL_RUN1, 0},
+	{"YSHELL_STND", 0, SPR_SSHL,  8,  4, {A_Look},  0, 0, S_YSHELL_STND, 0},
+	{"YSHELL_RUN1", 0, SPR_SSHL,  8,  4, {A_Chase}, 0, 0, S_YSHELL_RUN2, 0},
+	{"YSHELL_RUN2", 0, SPR_SSHL,  9,  4, {A_Chase}, 0, 0, S_YSHELL_RUN3, 0},
+	{"YSHELL_RUN3", 0, SPR_SSHL, 10,  4, {A_Chase}, 0, 0, S_YSHELL_RUN4, 0},
+	{"YSHELL_RUN4", 0, SPR_SSHL, 11,  4, {A_Chase}, 0, 0, S_YSHELL_RUN1, 0},
+	{"YSHELL_SPRING1", 0, SPR_SSHL, 15,  4, {A_Pain},  0, 0, S_YSHELL_SPRING2, 0},
+	{"YSHELL_SPRING2", 0, SPR_SSHL, 14,  1, {NULL},    0, 0, S_YSHELL_SPRING3, 0},
+	{"YSHELL_SPRING3", 0, SPR_SSHL, 13,  1, {NULL},    0, 0, S_YSHELL_SPRING4, 0},
+	{"YSHELL_SPRING4", 0, SPR_SSHL, 12,  1, {NULL},    0, 0, S_YSHELL_RUN1, 0},
 
 	// Unidus
-	{"S_UNIDUS_STND", 0, SPR_UNID, 0, 4, {A_Look},       0, 0, S_UNIDUS_STND, 0},
-	{"S_UNIDUS_RUN", 0, SPR_UNID, 0, 1, {A_Chase},      0, 0, S_UNIDUS_RUN , 0},
-	{"S_UNIDUS_BALL", 0, SPR_UNID, 1, 1, {A_UnidusBall}, 1, 0, S_UNIDUS_BALL, 0},
+	{"UNIDUS_STND", 0, SPR_UNID, 0, 4, {A_Look},       0, 0, S_UNIDUS_STND, 0},
+	{"UNIDUS_RUN", 0, SPR_UNID, 0, 1, {A_Chase},      0, 0, S_UNIDUS_RUN , 0},
+	{"UNIDUS_BALL", 0, SPR_UNID, 1, 1, {A_UnidusBall}, 1, 0, S_UNIDUS_BALL, 0},
 
 	// Canarivore
-	{"S_CANARIVORE_LOOK", 0, SPR_CANA, 0, 5,  {A_Look},          1200*FRACUNIT+1,   1,                 S_CANARIVORE_LOOK, 0},
-	{"S_CANARIVORE_AWAKEN1", 0, SPR_CANA, 0, 3,  {A_PlaySound},     sfx_s3k76,         1,                 S_CANARIVORE_AWAKEN2, 0},
-	{"S_CANARIVORE_AWAKEN2", 0, SPR_CANA, 1, 5,  {NULL},            0,                 0,                 S_CANARIVORE_AWAKEN3, 0},
-	{"S_CANARIVORE_AWAKEN3", 0, SPR_CANA, 2, 8,  {NULL},            0,                 0,                 S_CANARIVORE_GAS1, 0},
-	{"S_CANARIVORE_GAS1", 0, SPR_CANA, 2, 15, {A_PlaySound},     sfx_s3k93,         1,                 S_CANARIVORE_GAS2, 0},
-	{"S_CANARIVORE_GAS2", 0, SPR_CANA, 1, 4,  {NULL},            0,                 0,                 S_CANARIVORE_GAS3, 0},
-	{"S_CANARIVORE_GAS3", 0, SPR_CANA, 2, 0,  {A_PlaySound},     sfx_s3k97,         1,                 S_CANARIVORE_GAS4, 0},
-	{"S_CANARIVORE_GAS4", 0, SPR_CANA, 2, 5,  {A_CanarivoreGas}, MT_CANARIVORE_GAS, 0,                 S_CANARIVORE_GAS5, 0},
-	{"S_CANARIVORE_GAS5", 0, SPR_CANA, 1, 5,  {NULL},            0,                 0,                 S_CANARIVORE_GASREPEAT, 0},
-	{"S_CANARIVORE_GASREPEAT", 0, SPR_CANA, 2, 0,  {A_Repeat},        6,                 S_CANARIVORE_GAS4, S_CANARIVORE_CLOSE1, 0},
-	{"S_CANARIVORE_CLOSE1", 0, SPR_CANA, 1, 8,  {NULL},            0,                 0,                 S_CANARIVORE_CLOSE2, 0},
-	{"S_CANARIVORE_CLOSE2", 0, SPR_CANA, 0, 90, {NULL},            sfx_s3k5d,         1,                 S_CANARIVORE_LOOK, 0},
-
-	{"S_CANARIVOREGAS_1", 0, SPR_CANG, 0|FF_TRANS90, 2,         {NULL},            0, 0,       S_CANARIVOREGAS_2, 0},
-	{"S_CANARIVOREGAS_2", 0, SPR_CANG, 0|FF_TRANS30, 2*TICRATE, {A_SetRandomTics}, 2, TICRATE, S_CANARIVOREGAS_3, 0},
-	{"S_CANARIVOREGAS_3", 0, SPR_CANG, 0|FF_TRANS40, 10,        {NULL},            0, 0,       S_CANARIVOREGAS_4, 0},
-	{"S_CANARIVOREGAS_4", 0, SPR_CANG, 0|FF_TRANS50, 10,        {NULL},            0, 0,       S_CANARIVOREGAS_5, 0},
-	{"S_CANARIVOREGAS_5", 0, SPR_CANG, 0|FF_TRANS60, 10,        {NULL},            0, 0,       S_CANARIVOREGAS_6, 0},
-	{"S_CANARIVOREGAS_6", 0, SPR_CANG, 0|FF_TRANS70, 10,        {NULL},            0, 0,       S_CANARIVOREGAS_7, 0},
-	{"S_CANARIVOREGAS_7", 0, SPR_CANG, 0|FF_TRANS80, 10,        {NULL},            0, 0,       S_CANARIVOREGAS_8, 0},
-	{"S_CANARIVOREGAS_8", 0, SPR_CANG, 0|FF_TRANS90, 10,        {NULL},            0, 0,       S_NULL, 0},
+	{"CANARIVORE_LOOK", 0, SPR_CANA, 0, 5,  {A_Look},          1200*FRACUNIT+1,   1,                 S_CANARIVORE_LOOK, 0},
+	{"CANARIVORE_AWAKEN1", 0, SPR_CANA, 0, 3,  {A_PlaySound},     sfx_s3k76,         1,                 S_CANARIVORE_AWAKEN2, 0},
+	{"CANARIVORE_AWAKEN2", 0, SPR_CANA, 1, 5,  {NULL},            0,                 0,                 S_CANARIVORE_AWAKEN3, 0},
+	{"CANARIVORE_AWAKEN3", 0, SPR_CANA, 2, 8,  {NULL},            0,                 0,                 S_CANARIVORE_GAS1, 0},
+	{"CANARIVORE_GAS1", 0, SPR_CANA, 2, 15, {A_PlaySound},     sfx_s3k93,         1,                 S_CANARIVORE_GAS2, 0},
+	{"CANARIVORE_GAS2", 0, SPR_CANA, 1, 4,  {NULL},            0,                 0,                 S_CANARIVORE_GAS3, 0},
+	{"CANARIVORE_GAS3", 0, SPR_CANA, 2, 0,  {A_PlaySound},     sfx_s3k97,         1,                 S_CANARIVORE_GAS4, 0},
+	{"CANARIVORE_GAS4", 0, SPR_CANA, 2, 5,  {A_CanarivoreGas}, MT_CANARIVORE_GAS, 0,                 S_CANARIVORE_GAS5, 0},
+	{"CANARIVORE_GAS5", 0, SPR_CANA, 1, 5,  {NULL},            0,                 0,                 S_CANARIVORE_GASREPEAT, 0},
+	{"CANARIVORE_GASREPEAT", 0, SPR_CANA, 2, 0,  {A_Repeat},        6,                 S_CANARIVORE_GAS4, S_CANARIVORE_CLOSE1, 0},
+	{"CANARIVORE_CLOSE1", 0, SPR_CANA, 1, 8,  {NULL},            0,                 0,                 S_CANARIVORE_CLOSE2, 0},
+	{"CANARIVORE_CLOSE2", 0, SPR_CANA, 0, 90, {NULL},            sfx_s3k5d,         1,                 S_CANARIVORE_LOOK, 0},
+
+	{"CANARIVOREGAS_1", 0, SPR_CANG, 0|FF_TRANS90, 2,         {NULL},            0, 0,       S_CANARIVOREGAS_2, 0},
+	{"CANARIVOREGAS_2", 0, SPR_CANG, 0|FF_TRANS30, 2*TICRATE, {A_SetRandomTics}, 2, TICRATE, S_CANARIVOREGAS_3, 0},
+	{"CANARIVOREGAS_3", 0, SPR_CANG, 0|FF_TRANS40, 10,        {NULL},            0, 0,       S_CANARIVOREGAS_4, 0},
+	{"CANARIVOREGAS_4", 0, SPR_CANG, 0|FF_TRANS50, 10,        {NULL},            0, 0,       S_CANARIVOREGAS_5, 0},
+	{"CANARIVOREGAS_5", 0, SPR_CANG, 0|FF_TRANS60, 10,        {NULL},            0, 0,       S_CANARIVOREGAS_6, 0},
+	{"CANARIVOREGAS_6", 0, SPR_CANG, 0|FF_TRANS70, 10,        {NULL},            0, 0,       S_CANARIVOREGAS_7, 0},
+	{"CANARIVOREGAS_7", 0, SPR_CANG, 0|FF_TRANS80, 10,        {NULL},            0, 0,       S_CANARIVOREGAS_8, 0},
+	{"CANARIVOREGAS_8", 0, SPR_CANG, 0|FF_TRANS90, 10,        {NULL},            0, 0,       S_NULL, 0},
 
 	// Pyre Fly
-	{"S_PYREFLY_FLY", 0, SPR_PYRE, FF_ANIMATE, -1, {NULL}, 3, 2, S_NULL, 0},
-	{"S_PYREFLY_BURN", 0, SPR_PYRE, 4|FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 3, 2, S_NULL, 0},
-	{"S_PYREFIRE1", 0, SPR_FLAM, FF_FULLBRIGHT, 10, {NULL}, 0, 0, S_PYREFIRE2, 0},
-	{"S_PYREFIRE2", 0, SPR_FLAM, 1|FF_FULLBRIGHT, 10, {A_FireShrink}, 0, 16, S_NULL, 0},
+	{"PYREFLY_FLY", 0, SPR_PYRE, FF_ANIMATE, -1, {NULL}, 3, 2, S_NULL, 0},
+	{"PYREFLY_BURN", 0, SPR_PYRE, 4|FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 3, 2, S_NULL, 0},
+	{"PYREFIRE1", 0, SPR_FLAM, FF_FULLBRIGHT, 10, {NULL}, 0, 0, S_PYREFIRE2, 0},
+	{"PYREFIRE2", 0, SPR_FLAM, 1|FF_FULLBRIGHT, 10, {A_FireShrink}, 0, 16, S_NULL, 0},
 
 	// Pterabyte
-	{"S_PTERABYTESPAWNER", 0, SPR_NULL, 0, -1, {A_SpawnPterabytes}, 0, 0, S_PTERABYTESPAWNER, 0},
-	{"S_PTERABYTEWAYPOINT", 0, SPR_NULL, 0,  1, {A_PterabyteHover},  0, 0, S_PTERABYTEWAYPOINT, 0},
-	{"S_PTERABYTE_FLY1", 0, SPR_PTER, 0,  6, {NULL},              0, 0, S_PTERABYTE_FLY2, 0},
-	{"S_PTERABYTE_FLY2", 0, SPR_PTER, 1,  2, {NULL},              0, 0, S_PTERABYTE_FLY3, 0},
-	{"S_PTERABYTE_FLY3", 0, SPR_PTER, 2,  6, {NULL},              0, 0, S_PTERABYTE_FLY4, 0},
-	{"S_PTERABYTE_FLY4", 0, SPR_PTER, 3,  2, {NULL},              0, 0, S_PTERABYTE_FLY1, 0},
-	{"S_PTERABYTE_SWOOPDOWN", 0, SPR_PTER, 4,  1, {NULL},              0, 0, S_PTERABYTE_SWOOPDOWN, 0},
-	{"S_PTERABYTE_SWOOPUP", 0, SPR_PTER, 0,  1, {NULL},              0, 0, S_PTERABYTE_SWOOPUP, 0},
+	{"PTERABYTESPAWNER", 0, SPR_NULL, 0, -1, {A_SpawnPterabytes}, 0, 0, S_PTERABYTESPAWNER, 0},
+	{"PTERABYTEWAYPOINT", 0, SPR_NULL, 0,  1, {A_PterabyteHover},  0, 0, S_PTERABYTEWAYPOINT, 0},
+	{"PTERABYTE_FLY1", 0, SPR_PTER, 0,  6, {NULL},              0, 0, S_PTERABYTE_FLY2, 0},
+	{"PTERABYTE_FLY2", 0, SPR_PTER, 1,  2, {NULL},              0, 0, S_PTERABYTE_FLY3, 0},
+	{"PTERABYTE_FLY3", 0, SPR_PTER, 2,  6, {NULL},              0, 0, S_PTERABYTE_FLY4, 0},
+	{"PTERABYTE_FLY4", 0, SPR_PTER, 3,  2, {NULL},              0, 0, S_PTERABYTE_FLY1, 0},
+	{"PTERABYTE_SWOOPDOWN", 0, SPR_PTER, 4,  1, {NULL},              0, 0, S_PTERABYTE_SWOOPDOWN, 0},
+	{"PTERABYTE_SWOOPUP", 0, SPR_PTER, 0,  1, {NULL},              0, 0, S_PTERABYTE_SWOOPUP, 0},
 
 	// Dragonbomber
-	{"S_DRAGONBOMBER", 0, SPR_DRAB,                0, -1, {A_DragonbomberSpawn}, 6, 0, S_NULL, 0},
-	{"S_DRAGONWING1", 0, SPR_DRAB, FF_PAPERSPRITE|7,  1,        {A_DragonWing}, 0, 0, S_DRAGONWING2, 0},
-	{"S_DRAGONWING2", 0, SPR_DRAB, FF_PAPERSPRITE|8,  1,        {A_DragonWing}, 0, 0, S_DRAGONWING3, 0},
-	{"S_DRAGONWING3", 0, SPR_DRAB, FF_PAPERSPRITE|9,  1,        {A_DragonWing}, 0, 0, S_DRAGONWING4, 0},
-	{"S_DRAGONWING4", 0, SPR_DRAB, FF_PAPERSPRITE|10, 1,        {A_DragonWing}, 0, 0, S_DRAGONWING1, 0},
-	{"S_DRAGONTAIL_LOADED", 0, SPR_DRAB,                1,  1,     {A_DragonSegment}, 0, 0, S_DRAGONTAIL_LOADED, 0},
-	{"S_DRAGONTAIL_EMPTY", 0, SPR_DRAB,                2,  1,     {A_DragonSegment}, 0, 0, S_DRAGONTAIL_EMPTYLOOP, 0},
-	{"S_DRAGONTAIL_EMPTYLOOP", 0, SPR_DRAB,                2,  0,            {A_Repeat}, 3*TICRATE, S_DRAGONTAIL_EMPTY, S_DRAGONTAIL_RELOAD, 0},
-	{"S_DRAGONTAIL_RELOAD", 0, SPR_DRAB,                1,  0,   {A_PlayActiveSound}, 0, 0, S_DRAGONTAIL_LOADED, 0},
-	{"S_DRAGONMINE", 0, SPR_DRAB,                3,  1,        {A_MinusCheck}, S_DRAGONMINE_LAND1, 0, S_DRAGONMINE, 0},
-	{"S_DRAGONMINE_LAND1", 0, SPR_DRAB,                4,  0,   {A_PlayActiveSound}, 0, 0, S_DRAGONMINE_LAND2, 0},
-	{"S_DRAGONMINE_LAND2", 0, SPR_DRAB,                4,  2,            {A_Thrust}, 0, 1, S_DRAGONMINE_SLOWFLASH1, 0},
-	{"S_DRAGONMINE_SLOWFLASH1", 0, SPR_DRAB,                5, 11,                {NULL}, 0, 0, S_DRAGONMINE_SLOWFLASH2, 0},
-	{"S_DRAGONMINE_SLOWFLASH2", 0, SPR_DRAB,  FF_FULLBRIGHT|6,  1,   {A_PlayAttackSound}, 0, 0, S_DRAGONMINE_SLOWLOOP, 0},
-	{"S_DRAGONMINE_SLOWLOOP", 0, SPR_DRAB,                5,  0,            {A_Repeat}, 4, S_DRAGONMINE_SLOWFLASH1, S_DRAGONMINE_FASTFLASH1, 0},
-	{"S_DRAGONMINE_FASTFLASH1", 0, SPR_DRAB,                5,  3,                {NULL}, 0, 0, S_DRAGONMINE_FASTFLASH2, 0},
-	{"S_DRAGONMINE_FASTFLASH2", 0, SPR_DRAB,  FF_FULLBRIGHT|6,  1,   {A_PlayAttackSound}, 0, 0, S_DRAGONMINE_FASTLOOP, 0},
-	{"S_DRAGONMINE_FASTLOOP", 0, SPR_DRAB,                5,  0,            {A_Repeat}, 5, S_DRAGONMINE_FASTFLASH1, S_DEATHSTATE, 0},
+	{"DRAGONBOMBER", 0, SPR_DRAB,                0, -1, {A_DragonbomberSpawn}, 6, 0, S_NULL, 0},
+	{"DRAGONWING1", 0, SPR_DRAB, FF_PAPERSPRITE|7,  1,        {A_DragonWing}, 0, 0, S_DRAGONWING2, 0},
+	{"DRAGONWING2", 0, SPR_DRAB, FF_PAPERSPRITE|8,  1,        {A_DragonWing}, 0, 0, S_DRAGONWING3, 0},
+	{"DRAGONWING3", 0, SPR_DRAB, FF_PAPERSPRITE|9,  1,        {A_DragonWing}, 0, 0, S_DRAGONWING4, 0},
+	{"DRAGONWING4", 0, SPR_DRAB, FF_PAPERSPRITE|10, 1,        {A_DragonWing}, 0, 0, S_DRAGONWING1, 0},
+	{"DRAGONTAIL_LOADED", 0, SPR_DRAB,                1,  1,     {A_DragonSegment}, 0, 0, S_DRAGONTAIL_LOADED, 0},
+	{"DRAGONTAIL_EMPTY", 0, SPR_DRAB,                2,  1,     {A_DragonSegment}, 0, 0, S_DRAGONTAIL_EMPTYLOOP, 0},
+	{"DRAGONTAIL_EMPTYLOOP", 0, SPR_DRAB,                2,  0,            {A_Repeat}, 3*TICRATE, S_DRAGONTAIL_EMPTY, S_DRAGONTAIL_RELOAD, 0},
+	{"DRAGONTAIL_RELOAD", 0, SPR_DRAB,                1,  0,   {A_PlayActiveSound}, 0, 0, S_DRAGONTAIL_LOADED, 0},
+	{"DRAGONMINE", 0, SPR_DRAB,                3,  1,        {A_MinusCheck}, S_DRAGONMINE_LAND1, 0, S_DRAGONMINE, 0},
+	{"DRAGONMINE_LAND1", 0, SPR_DRAB,                4,  0,   {A_PlayActiveSound}, 0, 0, S_DRAGONMINE_LAND2, 0},
+	{"DRAGONMINE_LAND2", 0, SPR_DRAB,                4,  2,            {A_Thrust}, 0, 1, S_DRAGONMINE_SLOWFLASH1, 0},
+	{"DRAGONMINE_SLOWFLASH1", 0, SPR_DRAB,                5, 11,                {NULL}, 0, 0, S_DRAGONMINE_SLOWFLASH2, 0},
+	{"DRAGONMINE_SLOWFLASH2", 0, SPR_DRAB,  FF_FULLBRIGHT|6,  1,   {A_PlayAttackSound}, 0, 0, S_DRAGONMINE_SLOWLOOP, 0},
+	{"DRAGONMINE_SLOWLOOP", 0, SPR_DRAB,                5,  0,            {A_Repeat}, 4, S_DRAGONMINE_SLOWFLASH1, S_DRAGONMINE_FASTFLASH1, 0},
+	{"DRAGONMINE_FASTFLASH1", 0, SPR_DRAB,                5,  3,                {NULL}, 0, 0, S_DRAGONMINE_FASTFLASH2, 0},
+	{"DRAGONMINE_FASTFLASH2", 0, SPR_DRAB,  FF_FULLBRIGHT|6,  1,   {A_PlayAttackSound}, 0, 0, S_DRAGONMINE_FASTLOOP, 0},
+	{"DRAGONMINE_FASTLOOP", 0, SPR_DRAB,                5,  0,            {A_Repeat}, 5, S_DRAGONMINE_FASTFLASH1, S_DEATHSTATE, 0},
 
 	// Boss Explosion
-	{"S_BOSSEXPLODE", 0, SPR_BOM2, FF_FULLBRIGHT|FF_ANIMATE, (5*7), {NULL}, 6, 5, S_NULL, 0},
+	{"BOSSEXPLODE", 0, SPR_BOM2, FF_FULLBRIGHT|FF_ANIMATE, (5*7), {NULL}, 6, 5, S_NULL, 0},
 
 	// S3&K Boss Explosion
-	{"S_SONIC3KBOSSEXPLOSION1", 0, SPR_BOM3, FF_FULLBRIGHT,   1, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION2, 0},
-	{"S_SONIC3KBOSSEXPLOSION2", 0, SPR_BOM3, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION3, 0},
-	{"S_SONIC3KBOSSEXPLOSION3", 0, SPR_BOM3, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION4, 0},
-	{"S_SONIC3KBOSSEXPLOSION4", 0, SPR_BOM3, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION5, 0},
-	{"S_SONIC3KBOSSEXPLOSION5", 0, SPR_BOM3, FF_FULLBRIGHT|4, 3, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION6, 0},
-	{"S_SONIC3KBOSSEXPLOSION6", 0, SPR_BOM3, FF_FULLBRIGHT|5, 4, {NULL}, 0, 0, S_NULL, 0},
+	{"SONIC3KBOSSEXPLOSION1", 0, SPR_BOM3, FF_FULLBRIGHT,   1, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION2, 0},
+	{"SONIC3KBOSSEXPLOSION2", 0, SPR_BOM3, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION3, 0},
+	{"SONIC3KBOSSEXPLOSION3", 0, SPR_BOM3, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION4, 0},
+	{"SONIC3KBOSSEXPLOSION4", 0, SPR_BOM3, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION5, 0},
+	{"SONIC3KBOSSEXPLOSION5", 0, SPR_BOM3, FF_FULLBRIGHT|4, 3, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION6, 0},
+	{"SONIC3KBOSSEXPLOSION6", 0, SPR_BOM3, FF_FULLBRIGHT|5, 4, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_JETFUME1", 0, SPR_JETF, FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 2, 1, S_NULL, 0},
+	{"JETFUME1", 0, SPR_JETF, FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 2, 1, S_NULL, 0},
 
 	// Boss 1
-	{"S_EGGMOBILE_STND", 0, SPR_EGGM,  0,   1, {A_Boss1Chase},            0, 0, S_EGGMOBILE_STND, 0},
-	{"S_EGGMOBILE_ROFL", 0, SPR_EGGM, FF_ANIMATE|17, 35, {A_FaceTarget},  1, 2, S_EGGMOBILE_STND, 0},
-	{"S_EGGMOBILE_LATK1", 0, SPR_EGGM,  1,   3, {A_FaceTarget},            0, 0, S_EGGMOBILE_LATK2, 0},
-	{"S_EGGMOBILE_LATK2", 0, SPR_EGGM,  2,  15, {NULL},                    0, 0, S_EGGMOBILE_LATK3, 0},
-	{"S_EGGMOBILE_LATK3", 0, SPR_EGGM,  3,   2, {NULL},                    0, 0, S_EGGMOBILE_LATK4, 0},
-	{"S_EGGMOBILE_LATK4", 0, SPR_EGGM,  4,   2, {A_FaceTarget},            0, 0, S_EGGMOBILE_LATK5, 0},
-	{"S_EGGMOBILE_LATK5", 0, SPR_EGGM,  6,   0, {A_PrepareRepeat},        45, 0, S_EGGMOBILE_LATK6, 0},
-	{"S_EGGMOBILE_LATK6", 0, SPR_EGGM,  5,   1, {A_Boss1Laser},     MT_LASER, 0, S_EGGMOBILE_LATK7, 0},
-	{"S_EGGMOBILE_LATK7", 0, SPR_EGGM,  6,   1, {A_Boss1Laser},     MT_LASER, (1<<16), S_EGGMOBILE_LATK8, 0},
-	{"S_EGGMOBILE_LATK8", 0, SPR_EGGM,  5,   0, {A_Repeat}, 45, S_EGGMOBILE_LATK6, S_EGGMOBILE_LATK9, 0},
-	{"S_EGGMOBILE_LATK9", 0, SPR_EGGM,  8,  2, {NULL},                     0, 0, S_EGGMOBILE_ROFL, 0},
-	{"S_EGGMOBILE_RATK1", 0, SPR_EGGM,  9,   3, {A_FaceTarget},            0, 0, S_EGGMOBILE_RATK2, 0},
-	{"S_EGGMOBILE_RATK2", 0, SPR_EGGM, 10,  15, {NULL},                    0, 0, S_EGGMOBILE_RATK3, 0},
-	{"S_EGGMOBILE_RATK3", 0, SPR_EGGM, 11,   2, {NULL},                    0, 0, S_EGGMOBILE_RATK4, 0},
-	{"S_EGGMOBILE_RATK4", 0, SPR_EGGM, 12,   2, {A_FaceTarget},            0, 0, S_EGGMOBILE_RATK5, 0},
-	{"S_EGGMOBILE_RATK5", 0, SPR_EGGM, 14,   0, {A_PrepareRepeat},        45, 0, S_EGGMOBILE_RATK6, 0},
-	{"S_EGGMOBILE_RATK6", 0, SPR_EGGM, 13,   1, {A_Boss1Laser},     MT_LASER, 1, S_EGGMOBILE_RATK7, 0},
-	{"S_EGGMOBILE_RATK7", 0, SPR_EGGM, 14,   1, {A_Boss1Laser},     MT_LASER, 1|(1<<16), S_EGGMOBILE_RATK8, 0},
-	{"S_EGGMOBILE_RATK8", 0, SPR_EGGM, 13,   0, {A_Repeat}, 45, S_EGGMOBILE_RATK6, S_EGGMOBILE_RATK9, 0},
-	{"S_EGGMOBILE_RATK9", 0, SPR_EGGM, 16,  2, {NULL},                     0, 0, S_EGGMOBILE_ROFL, 0},
-	{"S_EGGMOBILE_PANIC1", 0, SPR_EGGM,  0,  0, {A_PrepareRepeat},            45, 0, S_EGGMOBILE_PANIC2, 0},
-	{"S_EGGMOBILE_PANIC2", 0, SPR_EGGM, FF_ANIMATE|1, 16, {A_FaceTarget},      3, 4, S_EGGMOBILE_PANIC3, 0},
-	{"S_EGGMOBILE_PANIC3", 0, SPR_EGGM,  7,  1, {A_Boss1Laser},         MT_LASER, 2, S_EGGMOBILE_PANIC4, 0},
-	{"S_EGGMOBILE_PANIC4", 0, SPR_EGGM,  6,  1, {A_Boss1Laser},         MT_LASER, 2|(1<<16), S_EGGMOBILE_PANIC5, 0},
-	{"S_EGGMOBILE_PANIC5", 0, SPR_EGGM,  6,  0, {A_Repeat}, 45,  S_EGGMOBILE_PANIC3, S_EGGMOBILE_PANIC6, 0},
-	{"S_EGGMOBILE_PANIC6", 0, SPR_EGGM,  0,  0, {A_PrepareRepeat},            45, 0, S_EGGMOBILE_PANIC7, 0},
-	{"S_EGGMOBILE_PANIC7", 0, SPR_EGGM, FF_ANIMATE|9, 16, {A_FaceTarget},      3, 4, S_EGGMOBILE_PANIC8, 0},
-	{"S_EGGMOBILE_PANIC8", 0, SPR_EGGM, 15,  1, {A_Boss1Laser},         MT_LASER, 2, S_EGGMOBILE_PANIC9, 0},
-	{"S_EGGMOBILE_PANIC9", 0, SPR_EGGM, 14,  1, {A_Boss1Laser},         MT_LASER, 2|(1<<16), S_EGGMOBILE_PANIC10, 0},
-	{"S_EGGMOBILE_PANIC10", 0, SPR_EGGM, 14,  0, {A_Repeat}, 45,  S_EGGMOBILE_PANIC8, S_EGGMOBILE_PANIC11, 0},
-	{"S_EGGMOBILE_PANIC11", 0, SPR_EGGM,  0,  0, {A_PrepareRepeat},            45, 0, S_EGGMOBILE_PANIC12, 0},
-	{"S_EGGMOBILE_PANIC12", 0, SPR_EGGM, FF_ANIMATE|1, 16, {A_FaceTarget},      3, 4, S_EGGMOBILE_PANIC13, 0},
-	{"S_EGGMOBILE_PANIC13", 0, SPR_EGGM,  7,  1, {A_Boss1Laser},         MT_LASER, 2, S_EGGMOBILE_PANIC14, 0},
-	{"S_EGGMOBILE_PANIC14", 0, SPR_EGGM,  6,  1, {A_Boss1Laser},         MT_LASER, 2|(1<<16), S_EGGMOBILE_PANIC15, 0},
-	{"S_EGGMOBILE_PANIC15", 0, SPR_EGGM,  6,  0, {A_Repeat}, 45,    S_EGGMOBILE_PANIC13, S_EGGMOBILE_ROFL, 0},
-	{"S_EGGMOBILE_PAIN", 0, SPR_EGGM, 19,  24, {A_Pain},                  0, 0, S_EGGMOBILE_PAIN2, 0},
-	{"S_EGGMOBILE_PAIN2", 0, SPR_EGGM, 19,  16, {A_SkullAttack},           3, 1, S_EGGMOBILE_STND, 0},
-	{"S_EGGMOBILE_DIE1", 0, SPR_EGGM, 20,  2, {A_Fall},                  17, 0, S_EGGMOBILE_DIE2, 0},
-	{"S_EGGMOBILE_DIE2", 0, SPR_EGGM, 20,  2, {A_BossScream},             0, 0, S_EGGMOBILE_DIE3, 0},
-	{"S_EGGMOBILE_DIE3", 0, SPR_EGGM, 20,  0, {A_Repeat}, 17, S_EGGMOBILE_DIE2, S_EGGMOBILE_DIE4, 0},
-	{"S_EGGMOBILE_DIE4", 0, SPR_EGGM, 20,  -1, {A_BossDeath},             0, 0, S_NULL, 0},
-	{"S_EGGMOBILE_FLEE1", 0, SPR_EGGM, 21,  2, {A_BossScream},             0, 0, S_EGGMOBILE_FLEE2, 0},
-	{"S_EGGMOBILE_FLEE2", 0, SPR_EGGM, 22,  2, {A_BossScream},             0, 0, S_EGGMOBILE_FLEE1, 0},
-	{"S_EGGMOBILE_BALL", 0, SPR_UNID,  1,  1, {A_UnidusBall},             2, 0, S_EGGMOBILE_BALL, 0},
-	{"S_EGGMOBILE_TARGET", 0, SPR_NULL,  0,  1, {A_FocusTarget},            0, 0, S_EGGMOBILE_TARGET, 0},
-
-	{"S_BOSSEGLZ1", 0, SPR_EGLZ, 0, 35, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BOSSEGLZ2", 0, SPR_EGLZ, 1, 35, {NULL}, 0, 0, S_NULL, 0},
+	{"EGGMOBILE_STND", 0, SPR_EGGM,  0,   1, {A_Boss1Chase},            0, 0, S_EGGMOBILE_STND, 0},
+	{"EGGMOBILE_ROFL", 0, SPR_EGGM, FF_ANIMATE|17, 35, {A_FaceTarget},  1, 2, S_EGGMOBILE_STND, 0},
+	{"EGGMOBILE_LATK1", 0, SPR_EGGM,  1,   3, {A_FaceTarget},            0, 0, S_EGGMOBILE_LATK2, 0},
+	{"EGGMOBILE_LATK2", 0, SPR_EGGM,  2,  15, {NULL},                    0, 0, S_EGGMOBILE_LATK3, 0},
+	{"EGGMOBILE_LATK3", 0, SPR_EGGM,  3,   2, {NULL},                    0, 0, S_EGGMOBILE_LATK4, 0},
+	{"EGGMOBILE_LATK4", 0, SPR_EGGM,  4,   2, {A_FaceTarget},            0, 0, S_EGGMOBILE_LATK5, 0},
+	{"EGGMOBILE_LATK5", 0, SPR_EGGM,  6,   0, {A_PrepareRepeat},        45, 0, S_EGGMOBILE_LATK6, 0},
+	{"EGGMOBILE_LATK6", 0, SPR_EGGM,  5,   1, {A_Boss1Laser},     MT_LASER, 0, S_EGGMOBILE_LATK7, 0},
+	{"EGGMOBILE_LATK7", 0, SPR_EGGM,  6,   1, {A_Boss1Laser},     MT_LASER, (1<<16), S_EGGMOBILE_LATK8, 0},
+	{"EGGMOBILE_LATK8", 0, SPR_EGGM,  5,   0, {A_Repeat}, 45, S_EGGMOBILE_LATK6, S_EGGMOBILE_LATK9, 0},
+	{"EGGMOBILE_LATK9", 0, SPR_EGGM,  8,  2, {NULL},                     0, 0, S_EGGMOBILE_ROFL, 0},
+	{"EGGMOBILE_RATK1", 0, SPR_EGGM,  9,   3, {A_FaceTarget},            0, 0, S_EGGMOBILE_RATK2, 0},
+	{"EGGMOBILE_RATK2", 0, SPR_EGGM, 10,  15, {NULL},                    0, 0, S_EGGMOBILE_RATK3, 0},
+	{"EGGMOBILE_RATK3", 0, SPR_EGGM, 11,   2, {NULL},                    0, 0, S_EGGMOBILE_RATK4, 0},
+	{"EGGMOBILE_RATK4", 0, SPR_EGGM, 12,   2, {A_FaceTarget},            0, 0, S_EGGMOBILE_RATK5, 0},
+	{"EGGMOBILE_RATK5", 0, SPR_EGGM, 14,   0, {A_PrepareRepeat},        45, 0, S_EGGMOBILE_RATK6, 0},
+	{"EGGMOBILE_RATK6", 0, SPR_EGGM, 13,   1, {A_Boss1Laser},     MT_LASER, 1, S_EGGMOBILE_RATK7, 0},
+	{"EGGMOBILE_RATK7", 0, SPR_EGGM, 14,   1, {A_Boss1Laser},     MT_LASER, 1|(1<<16), S_EGGMOBILE_RATK8, 0},
+	{"EGGMOBILE_RATK8", 0, SPR_EGGM, 13,   0, {A_Repeat}, 45, S_EGGMOBILE_RATK6, S_EGGMOBILE_RATK9, 0},
+	{"EGGMOBILE_RATK9", 0, SPR_EGGM, 16,  2, {NULL},                     0, 0, S_EGGMOBILE_ROFL, 0},
+	{"EGGMOBILE_PANIC1", 0, SPR_EGGM,  0,  0, {A_PrepareRepeat},            45, 0, S_EGGMOBILE_PANIC2, 0},
+	{"EGGMOBILE_PANIC2", 0, SPR_EGGM, FF_ANIMATE|1, 16, {A_FaceTarget},      3, 4, S_EGGMOBILE_PANIC3, 0},
+	{"EGGMOBILE_PANIC3", 0, SPR_EGGM,  7,  1, {A_Boss1Laser},         MT_LASER, 2, S_EGGMOBILE_PANIC4, 0},
+	{"EGGMOBILE_PANIC4", 0, SPR_EGGM,  6,  1, {A_Boss1Laser},         MT_LASER, 2|(1<<16), S_EGGMOBILE_PANIC5, 0},
+	{"EGGMOBILE_PANIC5", 0, SPR_EGGM,  6,  0, {A_Repeat}, 45,  S_EGGMOBILE_PANIC3, S_EGGMOBILE_PANIC6, 0},
+	{"EGGMOBILE_PANIC6", 0, SPR_EGGM,  0,  0, {A_PrepareRepeat},            45, 0, S_EGGMOBILE_PANIC7, 0},
+	{"EGGMOBILE_PANIC7", 0, SPR_EGGM, FF_ANIMATE|9, 16, {A_FaceTarget},      3, 4, S_EGGMOBILE_PANIC8, 0},
+	{"EGGMOBILE_PANIC8", 0, SPR_EGGM, 15,  1, {A_Boss1Laser},         MT_LASER, 2, S_EGGMOBILE_PANIC9, 0},
+	{"EGGMOBILE_PANIC9", 0, SPR_EGGM, 14,  1, {A_Boss1Laser},         MT_LASER, 2|(1<<16), S_EGGMOBILE_PANIC10, 0},
+	{"EGGMOBILE_PANIC10", 0, SPR_EGGM, 14,  0, {A_Repeat}, 45,  S_EGGMOBILE_PANIC8, S_EGGMOBILE_PANIC11, 0},
+	{"EGGMOBILE_PANIC11", 0, SPR_EGGM,  0,  0, {A_PrepareRepeat},            45, 0, S_EGGMOBILE_PANIC12, 0},
+	{"EGGMOBILE_PANIC12", 0, SPR_EGGM, FF_ANIMATE|1, 16, {A_FaceTarget},      3, 4, S_EGGMOBILE_PANIC13, 0},
+	{"EGGMOBILE_PANIC13", 0, SPR_EGGM,  7,  1, {A_Boss1Laser},         MT_LASER, 2, S_EGGMOBILE_PANIC14, 0},
+	{"EGGMOBILE_PANIC14", 0, SPR_EGGM,  6,  1, {A_Boss1Laser},         MT_LASER, 2|(1<<16), S_EGGMOBILE_PANIC15, 0},
+	{"EGGMOBILE_PANIC15", 0, SPR_EGGM,  6,  0, {A_Repeat}, 45,    S_EGGMOBILE_PANIC13, S_EGGMOBILE_ROFL, 0},
+	{"EGGMOBILE_PAIN", 0, SPR_EGGM, 19,  24, {A_Pain},                  0, 0, S_EGGMOBILE_PAIN2, 0},
+	{"EGGMOBILE_PAIN2", 0, SPR_EGGM, 19,  16, {A_SkullAttack},           3, 1, S_EGGMOBILE_STND, 0},
+	{"EGGMOBILE_DIE1", 0, SPR_EGGM, 20,  2, {A_Fall},                  17, 0, S_EGGMOBILE_DIE2, 0},
+	{"EGGMOBILE_DIE2", 0, SPR_EGGM, 20,  2, {A_BossScream},             0, 0, S_EGGMOBILE_DIE3, 0},
+	{"EGGMOBILE_DIE3", 0, SPR_EGGM, 20,  0, {A_Repeat}, 17, S_EGGMOBILE_DIE2, S_EGGMOBILE_DIE4, 0},
+	{"EGGMOBILE_DIE4", 0, SPR_EGGM, 20,  -1, {A_BossDeath},             0, 0, S_NULL, 0},
+	{"EGGMOBILE_FLEE1", 0, SPR_EGGM, 21,  2, {A_BossScream},             0, 0, S_EGGMOBILE_FLEE2, 0},
+	{"EGGMOBILE_FLEE2", 0, SPR_EGGM, 22,  2, {A_BossScream},             0, 0, S_EGGMOBILE_FLEE1, 0},
+	{"EGGMOBILE_BALL", 0, SPR_UNID,  1,  1, {A_UnidusBall},             2, 0, S_EGGMOBILE_BALL, 0},
+	{"EGGMOBILE_TARGET", 0, SPR_NULL,  0,  1, {A_FocusTarget},            0, 0, S_EGGMOBILE_TARGET, 0},
+
+	{"BOSSEGLZ1", 0, SPR_EGLZ, 0, 35, {NULL}, 0, 0, S_NULL, 0},
+	{"BOSSEGLZ2", 0, SPR_EGLZ, 1, 35, {NULL}, 0, 0, S_NULL, 0},
 
 	// Boss 2
-	{"S_EGGMOBILE2_STND", 0, SPR_EGGN, 0, -1,              {NULL},           0,          0, S_NULL, 0},
-	{"S_EGGMOBILE2_POGO1", 0, SPR_EGGN, 1, 4,               {NULL},           0,          0, S_EGGMOBILE2_POGO2, 0},
-	{"S_EGGMOBILE2_POGO2", 0, SPR_EGGN, 0, 2,  {A_Boss2PogoTarget},  9*FRACUNIT, 8*FRACUNIT, S_EGGMOBILE2_POGO3, 0},
-	{"S_EGGMOBILE2_POGO3", 0, SPR_EGGN, 1, 2,               {NULL},           0,          0, S_EGGMOBILE2_POGO4, 0},
-	{"S_EGGMOBILE2_POGO4", 0, SPR_EGGN, 2, -1,              {NULL},           0,          0, S_NULL, 0},
-	{"S_EGGMOBILE2_POGO5", 0, SPR_EGGN, 1, 4,               {NULL},           0,          0, S_EGGMOBILE2_POGO6, 0},
-	{"S_EGGMOBILE2_POGO6", 0, SPR_EGGN, 0, 2,  {A_Boss2PogoTarget},  7*FRACUNIT, 8*FRACUNIT, S_EGGMOBILE2_POGO7, 0},
-	{"S_EGGMOBILE2_POGO7", 0, SPR_EGGN, 1, 2,               {NULL},           0,          0, S_EGGMOBILE2_POGO4, 0},
-	{"S_EGGMOBILE2_PAIN", 0, SPR_EGGN, 3, 24, {A_Boss2TakeDamage},  24+TICRATE,          0, S_EGGMOBILE2_STND, 0},
-	{"S_EGGMOBILE2_PAIN2", 0, SPR_EGGN, 4, 24, {A_Boss2TakeDamage},  24+TICRATE,          0, S_EGGMOBILE2_POGO4, 0},
-	{"S_EGGMOBILE2_DIE1", 0, SPR_EGGN, 5, 2,             {A_Fall},           0,          0, S_EGGMOBILE2_DIE2, 0},
-	{"S_EGGMOBILE2_DIE2", 0, SPR_EGGN, 5, 2,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE3, 0},
-	{"S_EGGMOBILE2_DIE3", 0, SPR_EGGN, 5, 0,       {A_Repeat}, 17, S_EGGMOBILE2_DIE2, S_EGGMOBILE2_DIE4, 0},
-	{"S_EGGMOBILE2_DIE4", 0, SPR_EGGN, 5, -1,       {A_BossDeath},           0,          0, S_NULL, 0},
-	{"S_EGGMOBILE2_FLEE1", 0, SPR_EGGN, 6, 2,       {A_BossScream},           0,          0, S_EGGMOBILE2_FLEE2, 0},
-	{"S_EGGMOBILE2_FLEE2", 0, SPR_EGGN, 7, 2,       {A_BossScream},           0,          0, S_EGGMOBILE2_FLEE1, 0},
-
-	{"S_BOSSTANK1", 0, SPR_TANK, 0, 35, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BOSSTANK2", 0, SPR_TANK, 1, 35, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BOSSSPIGOT", 0, SPR_TANK, 2, 35, {NULL}, 0, 0, S_NULL, 0},
+	{"EGGMOBILE2_STND", 0, SPR_EGGN, 0, -1,              {NULL},           0,          0, S_NULL, 0},
+	{"EGGMOBILE2_POGO1", 0, SPR_EGGN, 1, 4,               {NULL},           0,          0, S_EGGMOBILE2_POGO2, 0},
+	{"EGGMOBILE2_POGO2", 0, SPR_EGGN, 0, 2,  {A_Boss2PogoTarget},  9*FRACUNIT, 8*FRACUNIT, S_EGGMOBILE2_POGO3, 0},
+	{"EGGMOBILE2_POGO3", 0, SPR_EGGN, 1, 2,               {NULL},           0,          0, S_EGGMOBILE2_POGO4, 0},
+	{"EGGMOBILE2_POGO4", 0, SPR_EGGN, 2, -1,              {NULL},           0,          0, S_NULL, 0},
+	{"EGGMOBILE2_POGO5", 0, SPR_EGGN, 1, 4,               {NULL},           0,          0, S_EGGMOBILE2_POGO6, 0},
+	{"EGGMOBILE2_POGO6", 0, SPR_EGGN, 0, 2,  {A_Boss2PogoTarget},  7*FRACUNIT, 8*FRACUNIT, S_EGGMOBILE2_POGO7, 0},
+	{"EGGMOBILE2_POGO7", 0, SPR_EGGN, 1, 2,               {NULL},           0,          0, S_EGGMOBILE2_POGO4, 0},
+	{"EGGMOBILE2_PAIN", 0, SPR_EGGN, 3, 24, {A_Boss2TakeDamage},  24+TICRATE,          0, S_EGGMOBILE2_STND, 0},
+	{"EGGMOBILE2_PAIN2", 0, SPR_EGGN, 4, 24, {A_Boss2TakeDamage},  24+TICRATE,          0, S_EGGMOBILE2_POGO4, 0},
+	{"EGGMOBILE2_DIE1", 0, SPR_EGGN, 5, 2,             {A_Fall},           0,          0, S_EGGMOBILE2_DIE2, 0},
+	{"EGGMOBILE2_DIE2", 0, SPR_EGGN, 5, 2,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE3, 0},
+	{"EGGMOBILE2_DIE3", 0, SPR_EGGN, 5, 0,       {A_Repeat}, 17, S_EGGMOBILE2_DIE2, S_EGGMOBILE2_DIE4, 0},
+	{"EGGMOBILE2_DIE4", 0, SPR_EGGN, 5, -1,       {A_BossDeath},           0,          0, S_NULL, 0},
+	{"EGGMOBILE2_FLEE1", 0, SPR_EGGN, 6, 2,       {A_BossScream},           0,          0, S_EGGMOBILE2_FLEE2, 0},
+	{"EGGMOBILE2_FLEE2", 0, SPR_EGGN, 7, 2,       {A_BossScream},           0,          0, S_EGGMOBILE2_FLEE1, 0},
+
+	{"BOSSTANK1", 0, SPR_TANK, 0, 35, {NULL}, 0, 0, S_NULL, 0},
+	{"BOSSTANK2", 0, SPR_TANK, 1, 35, {NULL}, 0, 0, S_NULL, 0},
+	{"BOSSSPIGOT", 0, SPR_TANK, 2, 35, {NULL}, 0, 0, S_NULL, 0},
 
 	// Boss 2 Goop
-	{"S_GOOP1", 0, SPR_GOOP,            0,  2, {A_SpawnObjectRelative}, 0, MT_GOOPTRAIL, S_GOOP2, 0},
-	{"S_GOOP2", 0, SPR_GOOP,            1,  2, {A_SpawnObjectRelative}, 0, MT_GOOPTRAIL, S_GOOP1, 0},
-	{"S_GOOP3", 0, SPR_GOOP,            2, -1,                  {NULL}, 0,            0, S_NULL, 0},
-	{"S_GOOPTRAIL", 0, SPR_GOOP, FF_ANIMATE|3, 11,                  {NULL}, 2,            6, S_NULL, 0},
+	{"GOOP1", 0, SPR_GOOP,            0,  2, {A_SpawnObjectRelative}, 0, MT_GOOPTRAIL, S_GOOP2, 0},
+	{"GOOP2", 0, SPR_GOOP,            1,  2, {A_SpawnObjectRelative}, 0, MT_GOOPTRAIL, S_GOOP1, 0},
+	{"GOOP3", 0, SPR_GOOP,            2, -1,                  {NULL}, 0,            0, S_NULL, 0},
+	{"GOOPTRAIL", 0, SPR_GOOP, FF_ANIMATE|3, 11,                  {NULL}, 2,            6, S_NULL, 0},
 
 	// Boss 3
-	{"S_EGGMOBILE3_STND", 0, SPR_EGGO,  0,   1, {NULL},                    0, 0, S_EGGMOBILE3_STND, 0},
-	{"S_EGGMOBILE3_SHOCK", 0, SPR_EGGO,   FF_ANIMATE, 24, {NULL}, 1, 2, S_EGGMOBILE3_ATK2, 0},
-	{"S_EGGMOBILE3_ATK1", 0, SPR_EGGO, 6|FF_ANIMATE, 24, {NULL}, 1, 2, S_EGGMOBILE3_ATK2, 0},
-	{"S_EGGMOBILE3_ATK2", 0, SPR_EGGO,  2,   2, {NULL},                    0, 0, S_EGGMOBILE3_ATK3A, 0},
-	{"S_EGGMOBILE3_ATK3A", 0, SPR_EGGO,  3,   2, {A_BossFireShot}, MT_TORPEDO, 2, S_EGGMOBILE3_ATK3B, 0},
-	{"S_EGGMOBILE3_ATK3B", 0, SPR_EGGO,  3,   2, {A_BossFireShot}, MT_TORPEDO, 4, S_EGGMOBILE3_ATK3C, 0},
-	{"S_EGGMOBILE3_ATK3C", 0, SPR_EGGO,  3,   2, {A_BossFireShot}, MT_TORPEDO, 3, S_EGGMOBILE3_ATK3D, 0},
-	{"S_EGGMOBILE3_ATK3D", 0, SPR_EGGO,  3,   2, {A_BossFireShot}, MT_TORPEDO, 5, S_EGGMOBILE3_ATK4, 0},
-	{"S_EGGMOBILE3_ATK4", 0, SPR_EGGO,  4,   2, {NULL},                    0, 0, S_EGGMOBILE3_ATK5, 0},
-	{"S_EGGMOBILE3_ATK5", 0, SPR_EGGO,  5,   2, {NULL},                    0, 0, S_EGGMOBILE3_ROFL, 0},
-	{"S_EGGMOBILE3_ROFL", 0, SPR_EGGO,  6|FF_ANIMATE, 60, {NULL}, 1, 2, S_EGGMOBILE3_STND, 0},
-	{"S_EGGMOBILE3_PAIN", 0, SPR_EGGO,  8,   1, {A_Boss3TakeDamage},       0, 0, S_EGGMOBILE3_PAIN2, 0},
-	{"S_EGGMOBILE3_PAIN2", 0, SPR_EGGO,  8,  23, {A_Pain},                  0, 0, S_EGGMOBILE3_STND, 0},
-	{"S_EGGMOBILE3_DIE1", 0, SPR_EGGO,  9,   2, {A_Fall},                  0, 0, S_EGGMOBILE3_DIE2, 0},
-	{"S_EGGMOBILE3_DIE2", 0, SPR_EGGO,  9,   2, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE3, 0},
-	{"S_EGGMOBILE3_DIE3", 0, SPR_EGGO,  9,   0, {A_Repeat}, 17, S_EGGMOBILE3_DIE2, S_EGGMOBILE3_DIE4, 0},
-	{"S_EGGMOBILE3_DIE4", 0, SPR_EGGO,  9,  -1, {A_BossDeath},             0, 0, S_NULL, 0},
-	{"S_EGGMOBILE3_FLEE1", 0, SPR_EGGO, 10,   2, {A_BossScream},            0, 0, S_EGGMOBILE3_FLEE2, 0},
-	{"S_EGGMOBILE3_FLEE2", 0, SPR_EGGO, 11,   2, {A_BossScream},            0, 0, S_EGGMOBILE3_FLEE1, 0},
+	{"EGGMOBILE3_STND", 0, SPR_EGGO,  0,   1, {NULL},                    0, 0, S_EGGMOBILE3_STND, 0},
+	{"EGGMOBILE3_SHOCK", 0, SPR_EGGO,   FF_ANIMATE, 24, {NULL}, 1, 2, S_EGGMOBILE3_ATK2, 0},
+	{"EGGMOBILE3_ATK1", 0, SPR_EGGO, 6|FF_ANIMATE, 24, {NULL}, 1, 2, S_EGGMOBILE3_ATK2, 0},
+	{"EGGMOBILE3_ATK2", 0, SPR_EGGO,  2,   2, {NULL},                    0, 0, S_EGGMOBILE3_ATK3A, 0},
+	{"EGGMOBILE3_ATK3A", 0, SPR_EGGO,  3,   2, {A_BossFireShot}, MT_TORPEDO, 2, S_EGGMOBILE3_ATK3B, 0},
+	{"EGGMOBILE3_ATK3B", 0, SPR_EGGO,  3,   2, {A_BossFireShot}, MT_TORPEDO, 4, S_EGGMOBILE3_ATK3C, 0},
+	{"EGGMOBILE3_ATK3C", 0, SPR_EGGO,  3,   2, {A_BossFireShot}, MT_TORPEDO, 3, S_EGGMOBILE3_ATK3D, 0},
+	{"EGGMOBILE3_ATK3D", 0, SPR_EGGO,  3,   2, {A_BossFireShot}, MT_TORPEDO, 5, S_EGGMOBILE3_ATK4, 0},
+	{"EGGMOBILE3_ATK4", 0, SPR_EGGO,  4,   2, {NULL},                    0, 0, S_EGGMOBILE3_ATK5, 0},
+	{"EGGMOBILE3_ATK5", 0, SPR_EGGO,  5,   2, {NULL},                    0, 0, S_EGGMOBILE3_ROFL, 0},
+	{"EGGMOBILE3_ROFL", 0, SPR_EGGO,  6|FF_ANIMATE, 60, {NULL}, 1, 2, S_EGGMOBILE3_STND, 0},
+	{"EGGMOBILE3_PAIN", 0, SPR_EGGO,  8,   1, {A_Boss3TakeDamage},       0, 0, S_EGGMOBILE3_PAIN2, 0},
+	{"EGGMOBILE3_PAIN2", 0, SPR_EGGO,  8,  23, {A_Pain},                  0, 0, S_EGGMOBILE3_STND, 0},
+	{"EGGMOBILE3_DIE1", 0, SPR_EGGO,  9,   2, {A_Fall},                  0, 0, S_EGGMOBILE3_DIE2, 0},
+	{"EGGMOBILE3_DIE2", 0, SPR_EGGO,  9,   2, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE3, 0},
+	{"EGGMOBILE3_DIE3", 0, SPR_EGGO,  9,   0, {A_Repeat}, 17, S_EGGMOBILE3_DIE2, S_EGGMOBILE3_DIE4, 0},
+	{"EGGMOBILE3_DIE4", 0, SPR_EGGO,  9,  -1, {A_BossDeath},             0, 0, S_NULL, 0},
+	{"EGGMOBILE3_FLEE1", 0, SPR_EGGO, 10,   2, {A_BossScream},            0, 0, S_EGGMOBILE3_FLEE2, 0},
+	{"EGGMOBILE3_FLEE2", 0, SPR_EGGO, 11,   2, {A_BossScream},            0, 0, S_EGGMOBILE3_FLEE1, 0},
 
 	// Boss 3 Pinch
-	{"S_FAKEMOBILE_INIT", 0, SPR_FAKE, 0,  1, {NULL},                     0, 0, S_FAKEMOBILE, 0},
-	{"S_FAKEMOBILE", 0, SPR_FAKE, 0,  1, {A_Boss3Path},              0, 0, S_FAKEMOBILE, 0},
-	{"S_FAKEMOBILE_ATK1", 0, SPR_FAKE, 0, 22, {NULL},                     0, 0, S_FAKEMOBILE_ATK2, 0},
-	{"S_FAKEMOBILE_ATK2", 0, SPR_FAKE, 0,  2, {NULL},                     0, 0, S_FAKEMOBILE_ATK3A, 0},
-	{"S_FAKEMOBILE_ATK3A", 0, SPR_FAKE, 0,  2, {A_BossFireShot}, MT_TORPEDO2, 2, S_FAKEMOBILE_ATK3B, 0},
-	{"S_FAKEMOBILE_ATK3B", 0, SPR_FAKE, 0,  2, {A_BossFireShot}, MT_TORPEDO2, 4, S_FAKEMOBILE_ATK3C, 0},
-	{"S_FAKEMOBILE_ATK3C", 0, SPR_FAKE, 0,  2, {A_BossFireShot}, MT_TORPEDO2, 3, S_FAKEMOBILE_ATK3D, 0},
-	{"S_FAKEMOBILE_ATK3D", 0, SPR_FAKE, 0,  2, {A_BossFireShot}, MT_TORPEDO2, 5, S_FAKEMOBILE, 0},
-	{"S_FAKEMOBILE_DIE1", 0, SPR_FAKE, 1,  1, {NULL},                     0, 0, S_FAKEMOBILE_DIE2, 0},
-	{"S_FAKEMOBILE_DIE2", 0, SPR_NULL, 0,  1, {NULL},                     0, 0, S_FAKEMOBILE_DIE1, 0},
-
-	{"S_BOSSSEBH1", 0, SPR_SEBH, 0, 35, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BOSSSEBH2", 0, SPR_SEBH, 1, 35, {NULL}, 0, 0, S_NULL, 0},
+	{"FAKEMOBILE_INIT", 0, SPR_FAKE, 0,  1, {NULL},                     0, 0, S_FAKEMOBILE, 0},
+	{"FAKEMOBILE", 0, SPR_FAKE, 0,  1, {A_Boss3Path},              0, 0, S_FAKEMOBILE, 0},
+	{"FAKEMOBILE_ATK1", 0, SPR_FAKE, 0, 22, {NULL},                     0, 0, S_FAKEMOBILE_ATK2, 0},
+	{"FAKEMOBILE_ATK2", 0, SPR_FAKE, 0,  2, {NULL},                     0, 0, S_FAKEMOBILE_ATK3A, 0},
+	{"FAKEMOBILE_ATK3A", 0, SPR_FAKE, 0,  2, {A_BossFireShot}, MT_TORPEDO2, 2, S_FAKEMOBILE_ATK3B, 0},
+	{"FAKEMOBILE_ATK3B", 0, SPR_FAKE, 0,  2, {A_BossFireShot}, MT_TORPEDO2, 4, S_FAKEMOBILE_ATK3C, 0},
+	{"FAKEMOBILE_ATK3C", 0, SPR_FAKE, 0,  2, {A_BossFireShot}, MT_TORPEDO2, 3, S_FAKEMOBILE_ATK3D, 0},
+	{"FAKEMOBILE_ATK3D", 0, SPR_FAKE, 0,  2, {A_BossFireShot}, MT_TORPEDO2, 5, S_FAKEMOBILE, 0},
+	{"FAKEMOBILE_DIE1", 0, SPR_FAKE, 1,  1, {NULL},                     0, 0, S_FAKEMOBILE_DIE2, 0},
+	{"FAKEMOBILE_DIE2", 0, SPR_NULL, 0,  1, {NULL},                     0, 0, S_FAKEMOBILE_DIE1, 0},
+
+	{"BOSSSEBH1", 0, SPR_SEBH, 0, 35, {NULL}, 0, 0, S_NULL, 0},
+	{"BOSSSEBH2", 0, SPR_SEBH, 1, 35, {NULL}, 0, 0, S_NULL, 0},
 
 	// Boss 3 Shockwave
 
-	{"S_SHOCKWAVE1", 0, SPR_SHCK,   FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 8, {A_Boss3ShockThink}, 4, 2, S_SHOCKWAVE2, 0},
-	{"S_SHOCKWAVE2", 0, SPR_SHCK, 3|FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 8, {A_Boss3ShockThink}, 4, 2, S_SHOCKWAVE1, 0},
+	{"SHOCKWAVE1", 0, SPR_SHCK,   FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 8, {A_Boss3ShockThink}, 4, 2, S_SHOCKWAVE2, 0},
+	{"SHOCKWAVE2", 0, SPR_SHCK, 3|FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 8, {A_Boss3ShockThink}, 4, 2, S_SHOCKWAVE1, 0},
 
 	// Boss 4
-	{"S_EGGMOBILE4_STND", 0, SPR_EGGP, 0, -1, {NULL},           0,          0, S_NULL, 0},
-	{"S_EGGMOBILE4_LATK1", 0, SPR_EGGP, 1,  3, {NULL},           0,          0, S_EGGMOBILE4_LATK2, 0},
-	{"S_EGGMOBILE4_LATK2", 0, SPR_EGGP, 2, 15, {NULL},           0,          0, S_EGGMOBILE4_LATK3, 0},
-	{"S_EGGMOBILE4_LATK3", 0, SPR_EGGP, 3,  2, {NULL},           0,          0, S_EGGMOBILE4_LATK4, 0},
-	{"S_EGGMOBILE4_LATK4", 0, SPR_EGGP, 4,  2, {NULL},           0,          0, S_EGGMOBILE4_LATK5, 0},
-	{"S_EGGMOBILE4_LATK5", 0, SPR_EGGP, 5, 50, {A_Boss4Reverse}, sfx_mswing, 0, S_EGGMOBILE4_LATK6, 0},
-	{"S_EGGMOBILE4_LATK6", 0, SPR_EGGP, 6,  2, {NULL},           0,          0, S_EGGMOBILE4_STND, 0},
-	{"S_EGGMOBILE4_RATK1", 0, SPR_EGGP, 7,  3, {NULL},           0,          0, S_EGGMOBILE4_RATK2, 0},
-	{"S_EGGMOBILE4_RATK2", 0, SPR_EGGP, 8, 15, {NULL},           0,          0, S_EGGMOBILE4_RATK3, 0},
-	{"S_EGGMOBILE4_RATK3", 0, SPR_EGGP, 9,  2, {NULL},           0,          0, S_EGGMOBILE4_RATK4, 0},
-	{"S_EGGMOBILE4_RATK4", 0, SPR_EGGP,10,  2, {NULL},           0,          0, S_EGGMOBILE4_RATK5, 0},
-	{"S_EGGMOBILE4_RATK5", 0, SPR_EGGP,11,150, {A_Boss4SpeedUp}, sfx_mswing, 0, S_EGGMOBILE4_RATK6, 0},
-	{"S_EGGMOBILE4_RATK6", 0, SPR_EGGP,12,  2, {NULL},           0,          0, S_EGGMOBILE4_STND, 0},
-	{"S_EGGMOBILE4_RAISE1", 0, SPR_EGGP,13, 20, {A_Boss4Raise},   sfx_doord1, 0, S_EGGMOBILE4_RAISE2, 0},
-	{"S_EGGMOBILE4_RAISE2", 0, SPR_EGGP,15|FF_ANIMATE, -1, {NULL},        1,        10, S_NULL, 0},
-	{"S_EGGMOBILE4_PAIN1", 0, SPR_EGGP,13,  0, {A_Boss4Reverse}, sfx_alarm, sfx_s3k60, S_EGGMOBILE4_PAIN2, 0},
-	{"S_EGGMOBILE4_PAIN2", 0, SPR_EGGP,13, 24, {A_Pain},                 0,         0, S_EGGMOBILE4_STND, 0},
-	{"S_EGGMOBILE4_DIE1", 0, SPR_EGGP,14,  2, {A_Fall},         0,          0, S_EGGMOBILE4_DIE2, 0},
-	{"S_EGGMOBILE4_DIE2", 0, SPR_EGGP,14,  2, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE3, 0},
-	{"S_EGGMOBILE4_DIE3", 0, SPR_EGGP,14,  0, {A_Repeat},   17, S_EGGMOBILE4_DIE2, S_EGGMOBILE4_DIE4, 0},
-	{"S_EGGMOBILE4_DIE4", 0, SPR_EGGP,14, -1, {A_BossDeath},    0,          0, S_NULL, 0},
-	{"S_EGGMOBILE4_FLEE1", 0, SPR_EGGP,15,  2, {A_BossScream},   0,          0, S_EGGMOBILE4_FLEE2, 0},
-	{"S_EGGMOBILE4_FLEE2", 0, SPR_EGGP,16,  2, {A_BossScream},   0,          0, S_EGGMOBILE4_FLEE1, 0},
-	{"S_EGGMOBILE4_MACE", 0, SPR_BMCE, 0, -1, {NULL},           0,          0, S_NULL, 0},
-	{"S_EGGMOBILE4_MACE_DIE1", 0, SPR_BMCE, 0,  2, {A_BossScream},   1, 0, S_EGGMOBILE4_MACE_DIE2, 0},
-	{"S_EGGMOBILE4_MACE_DIE2", 0, SPR_NULL, 0,  2, {A_BossScream},   1, 0, S_EGGMOBILE4_MACE_DIE3, 0},
-	{"S_EGGMOBILE4_MACE_DIE3", 0, SPR_NULL, 0,  0, {A_Repeat},       7, S_EGGMOBILE4_MACE_DIE1, S_SONIC3KBOSSEXPLOSION1, 0},
+	{"EGGMOBILE4_STND", 0, SPR_EGGP, 0, -1, {NULL},           0,          0, S_NULL, 0},
+	{"EGGMOBILE4_LATK1", 0, SPR_EGGP, 1,  3, {NULL},           0,          0, S_EGGMOBILE4_LATK2, 0},
+	{"EGGMOBILE4_LATK2", 0, SPR_EGGP, 2, 15, {NULL},           0,          0, S_EGGMOBILE4_LATK3, 0},
+	{"EGGMOBILE4_LATK3", 0, SPR_EGGP, 3,  2, {NULL},           0,          0, S_EGGMOBILE4_LATK4, 0},
+	{"EGGMOBILE4_LATK4", 0, SPR_EGGP, 4,  2, {NULL},           0,          0, S_EGGMOBILE4_LATK5, 0},
+	{"EGGMOBILE4_LATK5", 0, SPR_EGGP, 5, 50, {A_Boss4Reverse}, sfx_mswing, 0, S_EGGMOBILE4_LATK6, 0},
+	{"EGGMOBILE4_LATK6", 0, SPR_EGGP, 6,  2, {NULL},           0,          0, S_EGGMOBILE4_STND, 0},
+	{"EGGMOBILE4_RATK1", 0, SPR_EGGP, 7,  3, {NULL},           0,          0, S_EGGMOBILE4_RATK2, 0},
+	{"EGGMOBILE4_RATK2", 0, SPR_EGGP, 8, 15, {NULL},           0,          0, S_EGGMOBILE4_RATK3, 0},
+	{"EGGMOBILE4_RATK3", 0, SPR_EGGP, 9,  2, {NULL},           0,          0, S_EGGMOBILE4_RATK4, 0},
+	{"EGGMOBILE4_RATK4", 0, SPR_EGGP,10,  2, {NULL},           0,          0, S_EGGMOBILE4_RATK5, 0},
+	{"EGGMOBILE4_RATK5", 0, SPR_EGGP,11,150, {A_Boss4SpeedUp}, sfx_mswing, 0, S_EGGMOBILE4_RATK6, 0},
+	{"EGGMOBILE4_RATK6", 0, SPR_EGGP,12,  2, {NULL},           0,          0, S_EGGMOBILE4_STND, 0},
+	{"EGGMOBILE4_RAISE1", 0, SPR_EGGP,13, 20, {A_Boss4Raise},   sfx_doord1, 0, S_EGGMOBILE4_RAISE2, 0},
+	{"EGGMOBILE4_RAISE2", 0, SPR_EGGP,15|FF_ANIMATE, -1, {NULL},        1,        10, S_NULL, 0},
+	{"EGGMOBILE4_PAIN1", 0, SPR_EGGP,13,  0, {A_Boss4Reverse}, sfx_alarm, sfx_s3k60, S_EGGMOBILE4_PAIN2, 0},
+	{"EGGMOBILE4_PAIN2", 0, SPR_EGGP,13, 24, {A_Pain},                 0,         0, S_EGGMOBILE4_STND, 0},
+	{"EGGMOBILE4_DIE1", 0, SPR_EGGP,14,  2, {A_Fall},         0,          0, S_EGGMOBILE4_DIE2, 0},
+	{"EGGMOBILE4_DIE2", 0, SPR_EGGP,14,  2, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE3, 0},
+	{"EGGMOBILE4_DIE3", 0, SPR_EGGP,14,  0, {A_Repeat},   17, S_EGGMOBILE4_DIE2, S_EGGMOBILE4_DIE4, 0},
+	{"EGGMOBILE4_DIE4", 0, SPR_EGGP,14, -1, {A_BossDeath},    0,          0, S_NULL, 0},
+	{"EGGMOBILE4_FLEE1", 0, SPR_EGGP,15,  2, {A_BossScream},   0,          0, S_EGGMOBILE4_FLEE2, 0},
+	{"EGGMOBILE4_FLEE2", 0, SPR_EGGP,16,  2, {A_BossScream},   0,          0, S_EGGMOBILE4_FLEE1, 0},
+	{"EGGMOBILE4_MACE", 0, SPR_BMCE, 0, -1, {NULL},           0,          0, S_NULL, 0},
+	{"EGGMOBILE4_MACE_DIE1", 0, SPR_BMCE, 0,  2, {A_BossScream},   1, 0, S_EGGMOBILE4_MACE_DIE2, 0},
+	{"EGGMOBILE4_MACE_DIE2", 0, SPR_NULL, 0,  2, {A_BossScream},   1, 0, S_EGGMOBILE4_MACE_DIE3, 0},
+	{"EGGMOBILE4_MACE_DIE3", 0, SPR_NULL, 0,  0, {A_Repeat},       7, S_EGGMOBILE4_MACE_DIE1, S_SONIC3KBOSSEXPLOSION1, 0},
 
 	// Boss 4 jet flame
-	{"S_JETFLAME", 0, SPR_EFIR, FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 1, 1, S_NULL, 0},
+	{"JETFLAME", 0, SPR_EFIR, FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 1, 1, S_NULL, 0},
 
 	// Boss 4 Spectator Eggrobo
-	{"S_EGGROBO1_STND", 0, SPR_EGR1,            0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EGGROBO1_BSLAP1", 0, SPR_EGR1,            5,  2, {NULL}, 0, 0, S_EGGROBO1_BSLAP2, 0},
-	{"S_EGGROBO1_BSLAP2", 0, SPR_EGR1, FF_ANIMATE|6, 35, {NULL}, 1, 2, S_EGGROBO1_STND, 0},
-	{"S_EGGROBO1_PISSED", 0, SPR_EGR1, FF_ANIMATE|3, -1, {NULL}, 1, 2, S_NULL, 0},
+	{"EGGROBO1_STND", 0, SPR_EGR1,            0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EGGROBO1_BSLAP1", 0, SPR_EGR1,            5,  2, {NULL}, 0, 0, S_EGGROBO1_BSLAP2, 0},
+	{"EGGROBO1_BSLAP2", 0, SPR_EGR1, FF_ANIMATE|6, 35, {NULL}, 1, 2, S_EGGROBO1_STND, 0},
+	{"EGGROBO1_PISSED", 0, SPR_EGR1, FF_ANIMATE|3, -1, {NULL}, 1, 2, S_NULL, 0},
 
 	// Boss 4 Spectator Eggrobo jet flame
-	{"S_EGGROBOJET", 0, SPR_EFIR, FF_FULLBRIGHT|2,          -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EGGROBOJET", 0, SPR_EFIR, FF_FULLBRIGHT|2,          -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Boss 5
-	{"S_FANG_SETUP", 0, SPR_NULL, 0, 2, {A_CheckFlags2}, MF2_AMBUSH, S_FANG_IDLE0, S_FANG_INTRO0, 0},
-
-	{"S_FANG_INTRO0", 0, SPR_NULL, 0, 2, {NULL}, 0, 0, S_FANG_INTRO1, 0},
-	{"S_FANG_INTRO1", 0, SPR_NULL, 0, 2, {A_Boss5MakeJunk}, -S_FANG_CLONE1, 0, S_FANG_INTRO2, 0},
-	{"S_FANG_INTRO2", 0, SPR_NULL, 0, 0, {A_Repeat}, 25, S_FANG_INTRO1, S_FANG_INTRO3, 0},
-	{"S_FANG_INTRO3", 0, SPR_NULL, 0, 0, {A_Boss5MakeJunk}, 0, 1, S_FANG_INTRO4, 0},
-	{"S_FANG_INTRO4", 0, SPR_FANG, 30, 1, {A_ZThrust}, 9, (1<<16)|1, S_FANG_INTRO5, 0},
-	{"S_FANG_INTRO5", 0, SPR_FANG, 27, 1, {A_Boss5CheckOnGround}, S_FANG_INTRO9, 0, S_FANG_INTRO6, 0},
-	{"S_FANG_INTRO6", 0, SPR_FANG, 28, 1, {A_Boss5CheckOnGround}, S_FANG_INTRO9, 0, S_FANG_INTRO7, 0},
-	{"S_FANG_INTRO7", 0, SPR_FANG, 29, 1, {A_Boss5CheckOnGround}, S_FANG_INTRO9, 0, S_FANG_INTRO8, 0},
-	{"S_FANG_INTRO8", 0, SPR_FANG, 30, 1, {A_Boss5CheckOnGround}, S_FANG_INTRO9, 0, S_FANG_INTRO5, 0},
-	{"S_FANG_INTRO9", 0, SPR_FANG, 23|FF_ANIMATE, 50, {NULL}, 1, 4, S_FANG_INTRO10, 0},
-	{"S_FANG_INTRO10", 0, SPR_FANG, 25, 5, {NULL}, 0, 0, S_FANG_INTRO11, 0},
-	{"S_FANG_INTRO11", 0, SPR_FANG, 26, 2, {A_Boss5MakeJunk}, S_BROKENROBOTD, 2, S_FANG_INTRO12, 0},
-	{"S_FANG_INTRO12", 0, SPR_FANG, 31|FF_ANIMATE, 50, {NULL}, 3, 4, S_FANG_IDLE1, 0},
-
-	{"S_FANG_CLONE1", 0, SPR_FANG, 11, 2, {A_Boss5MakeJunk}, 0, -1, S_FANG_CLONE2, 0},
-	{"S_FANG_INTRO2", 0, SPR_FANG, 11, 0, {A_Repeat}, 49, S_FANG_CLONE1, S_FANG_CLONE3, 0},
-	{"S_FANG_CLONE3", 0, SPR_FANG, 12, 0, {A_SetObjectFlags}, MF_NOGRAVITY, 1, S_FANG_CLONE4, 0},
-	{"S_FANG_CLONE4", 0, SPR_FANG, 12, 1, {A_Boss5CheckOnGround}, S_FANG_IDLE0, 0, S_FANG_CLONE4, 0},
-
-	{"S_FANG_IDLE0", 0, SPR_FANG, 0,  0, {A_SetObjectFlags}, MF_NOCLIPTHING, 1, S_FANG_IDLE1, 0},
-	{"S_FANG_IDLE1", 0, SPR_FANG, 2, 16, {A_Look}, 1, 0, S_FANG_IDLE2, 0},
-	{"S_FANG_IDLE2", 0, SPR_FANG, 3, 16, {A_Look}, 1, 0, S_FANG_IDLE3, 0},
-	{"S_FANG_IDLE3", 0, SPR_FANG, 3, 16, {A_Look}, 1, 0, S_FANG_IDLE4, 0},
-	{"S_FANG_IDLE4", 0, SPR_FANG, 3, 16, {A_Look}, 1, 0, S_FANG_IDLE5, 0},
-	{"S_FANG_IDLE5", 0, SPR_FANG, 2, 16, {A_Look}, 1, 0, S_FANG_IDLE6, 0},
-	{"S_FANG_IDLE6", 0, SPR_FANG, 1, 16, {A_Look}, 1, 0, S_FANG_IDLE7, 0},
-	{"S_FANG_IDLE7", 0, SPR_FANG, 1, 16, {A_Look}, 1, 0, S_FANG_IDLE8, 0},
-	{"S_FANG_IDLE8", 0, SPR_FANG, 1, 16, {A_Look}, 1, 0, S_FANG_IDLE1, 0},
-
-	{"S_FANG_PAIN1", 0, SPR_FANG, 14, 0, {A_DoNPCPain}, FRACUNIT, 0, S_FANG_PAIN2, 0},
-	{"S_FANG_PAIN2", 0, SPR_FANG, 14, 1, {A_Boss5CheckOnGround}, S_FANG_PATHINGSTART1, S_FANG_PINCHPATHINGSTART1, S_FANG_PAIN2, 0},
-
-	{"S_FANG_PATHINGSTART1", 0, SPR_FANG,  8, 0, {A_Boss5ExtraRepeat}, 5, 4, S_FANG_PATHINGSTART2, 0},
-	{"S_FANG_PATHINGSTART2", 0, SPR_FANG,  8, 0, {A_PlayActiveSound}, 0, 0, S_FANG_PATHING, 0},
-	{"S_FANG_PATHING", 0, SPR_FANG,  8, 0, {A_Boss5FindWaypoint}, 0, 0, S_FANG_BOUNCE1, 0},
-
-	{"S_FANG_BOUNCE1", 0, SPR_FANG,  8, 2, {A_Thrust}, 0, 1, S_FANG_BOUNCE2, 0},
-	{"S_FANG_BOUNCE2", 0, SPR_FANG,  9, 2, {NULL}, 0, 0, S_FANG_BOUNCE3, 0},
-	{"S_FANG_BOUNCE3", 0, SPR_FANG, 10, 1, {A_Boss5Jump}, 0, 0, S_FANG_BOUNCE4, 0},
-	{"S_FANG_BOUNCE4", 0, SPR_FANG, 10, 1, {A_Boss5CheckFalling}, S_FANG_CHECKPATH1, S_FANG_FALL1, S_FANG_BOUNCE4, 0},
-
-	{"S_FANG_FALL1", 0, SPR_FANG, 12, 1, {A_Boss5CheckOnGround}, S_FANG_CHECKPATH1, 0, S_FANG_FALL2, 0},
-	{"S_FANG_FALL2", 0, SPR_FANG, 13, 1, {A_Boss5CheckOnGround}, S_FANG_CHECKPATH1, 0, S_FANG_FALL1, 0},
-
-	{"S_FANG_CHECKPATH1", 0, SPR_FANG,  8, 0, {A_Boss5Calm}, 0, 0, S_FANG_CHECKPATH2, 0},
-	{"S_FANG_CHECKPATH2", 0, SPR_FANG,  8, 0, {A_Repeat}, 0, S_FANG_PATHINGCONT1, S_FANG_SKID1, 0},
-
-	{"S_FANG_PATHINGCONT1", 0, SPR_FANG,  9, 0, {A_Boss5PinchShot}, MT_FBOMB, -16, S_FANG_PATHINGCONT2, 0},
-	{"S_FANG_PATHINGCONT2", 0, SPR_FANG,  9, 0, {A_PlayActiveSound}, 0, 0, S_FANG_PATHINGCONT3, 0},
-	{"S_FANG_PATHINGCONT3", 0, SPR_FANG,  9, 2, {A_Thrust}, 0, 1, S_FANG_PATHING, 0},
-
-	{"S_FANG_SKID1", 0, SPR_FANG,  4,  0, {A_PlayAttackSound}, 0, 0, S_FANG_SKID2, 0},
-	{"S_FANG_SKID2", 0, SPR_FANG,  4,  1, {A_DoNPCSkid}, S_FANG_SKID3, 0, S_FANG_SKID2, 0},
-	{"S_FANG_SKID3", 0, SPR_FANG,  4, 10, {NULL}, 0, 0, S_FANG_CHOOSEATTACK, 0},
-
-	{"S_FANG_CHOOSEATTACK", 0, SPR_FANG,  0, 0, {A_RandomState}, S_FANG_LOBSHOT0, S_FANG_FIRESTART1, S_NULL, 0},
-
-	{"S_FANG_FIRESTART1", 0, SPR_FANG,  5,  0, {A_PrepareRepeat}, 3, 0, S_FANG_FIRESTART2, 0},  // Reset loop
-	{"S_FANG_FIRESTART2", 0, SPR_FANG,  5, 18, {A_LookForBetter}, 1, 0, S_FANG_FIRE1, 0},
-	{"S_FANG_FIRE1", 0, SPR_FANG,  5,  5, {A_FireShot}, MT_CORK, -16, S_FANG_FIRE2, 0},  // Start of loop
-	{"S_FANG_FIRE2", 0, SPR_FANG,  6,  5, {NULL}, 0, 0, S_FANG_FIRE3, 0},
-	{"S_FANG_FIRE3", 0, SPR_FANG,  7,  5, {NULL}, 0, 0, S_FANG_FIRE4, 0},
-	{"S_FANG_FIRE4", 0, SPR_FANG,  5,  5, {NULL}, 2, 0, S_FANG_FIREREPEAT, 0},
-	{"S_FANG_FIREREPEAT", 0, SPR_FANG,  5,  0, {A_Repeat}, 3, S_FANG_FIRE1, S_FANG_WAIT1, 0},  // End of loop
-
-	{"S_FANG_LOBSHOT0", 0, SPR_FANG, 18, 16, {A_LookForBetter}, 1, 0, S_FANG_LOBSHOT1, 0},
-	{"S_FANG_LOBSHOT1", 0, SPR_FANG, 19,  2, {A_LookForBetter}, 1, 0, S_FANG_LOBSHOT2, 0},
-	{"S_FANG_LOBSHOT2", 0, SPR_FANG, 20, 18, {A_BrakLobShot}, MT_FBOMB, 32+(1<<16), S_FANG_WAIT1, 0},
-
-	{"S_FANG_WAIT1", 0, SPR_FANG, FF_ANIMATE|15, 70, {NULL}, 1, 5, S_FANG_WAIT2, 0},
-	{"S_FANG_WAIT2", 0, SPR_FANG,             0, 35, {A_Look}, 1, 0, S_FANG_IDLE1, 0},
-
-	{"S_FANG_WALLHIT", 0, SPR_FANG, 12, 1, {A_Boss5CheckOnGround}, S_FANG_PATHINGSTART2, S_FANG_PINCHPATHINGSTART1, S_FANG_WALLHIT, 0},
-
-	{"S_FANG_PINCHPATHINGSTART1", 0, SPR_FANG,  8,  0, {A_PrepareRepeat}, 1, 0, S_FANG_PINCHPATHINGSTART2, 0},
-	{"S_FANG_PINCHPATHINGSTART2", 0, SPR_FANG,  8,  0, {A_PlayActiveSound}, 0, 0, S_FANG_PINCHPATHING, 0},
-	{"S_FANG_PINCHPATHING", 0, SPR_FANG,  8,  0, {A_Boss5FindWaypoint}, 1, 0, S_FANG_PINCHBOUNCE0, 0},
-	{"S_FANG_PINCHBOUNCE0", 0, SPR_FANG,  8,  0, {A_SetObjectFlags}, MF_NOCLIP|MF_NOCLIPHEIGHT, 2, S_FANG_PINCHBOUNCE1, 0},
-	{"S_FANG_PINCHBOUNCE1", 0, SPR_FANG,  8,  2, {A_Thrust}, 0, 1, S_FANG_PINCHBOUNCE2, 0},
-	{"S_FANG_PINCHBOUNCE2", 0, SPR_FANG,  9,  2, {NULL}, 0, 0, S_FANG_PINCHBOUNCE3, 0},
-	{"S_FANG_PINCHBOUNCE3", 0, SPR_FANG, 10,  2, {A_Boss5Jump}, 0, 0, S_FANG_PINCHBOUNCE4, 0},
-	{"S_FANG_PINCHBOUNCE4", 0, SPR_FANG, 10,  1, {A_Boss5CheckFalling}, S_FANG_PINCHSKID1, S_FANG_PINCHFALL0, S_FANG_PINCHBOUNCE4, 0},
-	{"S_FANG_PINCHFALL0", 0, SPR_FANG, 12,  0, {A_SetObjectFlags}, MF_NOCLIP|MF_NOCLIPHEIGHT, 1, S_FANG_PINCHFALL1, 0},
-	{"S_FANG_PINCHFALL1", 0, SPR_FANG, 12,  1, {A_Boss5CheckOnGround}, S_FANG_PINCHSKID1, 0, S_FANG_PINCHFALL2, 0},
-	{"S_FANG_PINCHFALL2", 0, SPR_FANG, 13,  1, {A_Boss5CheckOnGround}, S_FANG_PINCHSKID1, 0, S_FANG_PINCHFALL1, 0},
-	{"S_FANG_PINCHSKID1", 0, SPR_FANG,  4,  0, {A_PlayAttackSound}, 0, 0, S_FANG_PINCHSKID2, 0},
-	{"S_FANG_PINCHSKID2", 0, SPR_FANG,  4,  1, {A_DoNPCSkid}, S_FANG_PINCHLOBSHOT0, 0, S_FANG_PINCHSKID2, 0},
-	{"S_FANG_PINCHLOBSHOT0", 0, SPR_FANG, 18, 16, {A_FaceTarget}, 3, 0, S_FANG_PINCHLOBSHOT1, 0},
-	{"S_FANG_PINCHLOBSHOT1", 0, SPR_FANG, 19,  2, {A_FaceTarget}, 3, 0, S_FANG_PINCHLOBSHOT2, 0},
-	{"S_FANG_PINCHLOBSHOT2", 0, SPR_FANG, 20, 30, {A_Boss5MakeItRain}, MT_FBOMB, -16, S_FANG_PINCHLOBSHOT3, 0},
-	{"S_FANG_PINCHLOBSHOT3", 0, SPR_FANG, 20, 18, {A_LinedefExecuteFromArg}, 4, 0, S_FANG_PINCHLOBSHOT4, 0},
-	{"S_FANG_PINCHLOBSHOT4", 0, SPR_FANG,  0,  0, {A_Boss5Calm}, 0, 0, S_FANG_PATHINGSTART1, 0},
-
-	{"S_FANG_DIE1", 0, SPR_FANG, 21, 0, {A_DoNPCPain},                    0, 0, S_FANG_DIE2, 0},
-	{"S_FANG_DIE2", 0, SPR_FANG, 21, 1, {A_Boss5CheckOnGround}, S_FANG_DIE3, 0, S_FANG_DIE2, 0},
-
-	{"S_FANG_DIE3", 0, SPR_FANG, 22,  0, {A_Scream}, 0, 0, S_FANG_DIE4, 0},
-	{"S_FANG_DIE4", 0, SPR_FANG, 22, -1, {A_SetFuse}, 70, 0, S_FANG_DIE5, 0},
-
-	{"S_FANG_DIE5", 0, SPR_FANG, 11, 0, {A_PlaySound}, sfx_jump, 0, S_FANG_DIE6, 0},
-	{"S_FANG_DIE6", 0, SPR_FANG, 11, 1, {A_ZThrust}, 6, (1<<16)|1, S_FANG_DIE7, 0},
-	{"S_FANG_DIE7", 0, SPR_FANG, 11, 1, {A_Boss5CheckFalling}, S_FANG_FLEEPATHING1, S_FANG_DIE8, S_FANG_DIE7, 0},
-	{"S_FANG_DIE8", 0, SPR_FANG, 12, 1, {A_Boss5CheckOnGround}, S_FANG_FLEEPATHING1, 0, S_FANG_DIE8, 0},
-
-	{"S_FANG_FLEEPATHING1", 0, SPR_FANG,  9,  0, {A_PlayActiveSound}, 0, 0, S_FANG_FLEEPATHING2, 0},
-	{"S_FANG_FLEEPATHING2", 0, SPR_FANG,  8,  2, {A_Boss5FindWaypoint}, 2, 0, S_FANG_FLEEBOUNCE1, 0},
-	{"S_FANG_FLEEBOUNCE1", 0, SPR_FANG,  9,  2, {NULL}, 0, 0, S_FANG_FLEEBOUNCE2, 0},
-	{"S_FANG_FLEEBOUNCE2", 0, SPR_FANG, 10, -1, {A_BossDeath}, 0, 0, S_NULL, 0},
-
-	{"S_FANG_KO", 0, SPR_FANG, 17, 7*TICRATE, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_BROKENROBOTRANDOM", 0, SPR_NULL, 0, -1, {A_RandomStateRange}, S_BROKENROBOTA, S_BROKENROBOTF, S_NULL, 0},
-	{"S_BROKENROBOTA", 0, SPR_BRKN,    FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 3, 4, S_NULL, 0},
-	{"S_BROKENROBOTB", 0, SPR_BRKN,  4|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 3, 4, S_NULL, 0},
-	{"S_BROKENROBOTC", 0, SPR_BRKN,  8|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 3, 4, S_NULL, 0},
-	{"S_BROKENROBOTD", 0, SPR_BRKN, 12|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 3, 4, S_NULL, 0},
-	{"S_BROKENROBOTE", 0, SPR_BRKN, 16|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 3, 4, S_NULL, 0},
-	{"S_BROKENROBOTF", 0, SPR_BRKN, 20|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 3, 4, S_NULL, 0},
-
-	{"S_ALART1", 0, SPR_WHAT,   FF_ANIMATE|FF_FULLBRIGHT,  4, {NULL}, 1, 2, S_ALART2, 0},
-	{"S_ALART2", 0, SPR_WHAT, 2|FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 1, 2, S_NULL, 0},
-
-	{"S_VWREF", 0, SPR_VWRE,   FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_VWREB", 0, SPR_VWRE, 1|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_PROJECTORLIGHT1", 0, SPR_PROJ,   FF_TRANS20|FF_FULLBRIGHT,  4, {NULL}, 0, 0, S_PROJECTORLIGHT2, 0},
-	{"S_PROJECTORLIGHT2", 0, SPR_PROJ, 1|FF_TRANS40|FF_FULLBRIGHT,  1, {NULL}, 0, 0, S_PROJECTORLIGHT3, 0},
-	{"S_PROJECTORLIGHT3", 0, SPR_PROJ, 2|FF_TRANS20|FF_FULLBRIGHT,  1, {NULL}, 0, 0, S_PROJECTORLIGHT4, 0},
-	{"S_PROJECTORLIGHT4", 0, SPR_PROJ, 3|FF_TRANS40|FF_FULLBRIGHT,  2, {A_Repeat}, 39, S_PROJECTORLIGHT2, S_PROJECTORLIGHT5, 0},
-	{"S_PROJECTORLIGHT5", 0, SPR_PROJ, 4|FF_TRANS60|FF_FULLBRIGHT,  2, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_FBOMB1", 0, SPR_FBOM, 0, 1, {A_GhostMe}, 0, 0, S_FBOMB2, 0},
-	{"S_FBOMB2", 0, SPR_FBOM, 1, 1, {A_GhostMe}, 0, 0, S_FBOMB1, 0},
-	{"S_FBOMB_EXPL1", 0, SPR_BARX, 0|FF_FULLBRIGHT, 3, {A_SetObjectFlags}, MF_NOCLIP|MF_NOGRAVITY|MF_NOBLOCKMAP, 0, S_FBOMB_EXPL2, 0},
-	{"S_FBOMB_EXPL2", 0, SPR_BARX, 1|FF_FULLBRIGHT, 2, {A_Boss5BombExplode}, MT_TNTDUST, 0, S_FBOMB_EXPL3, 0},
-	{"S_FBOMB_EXPL3", 0, SPR_BARX, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_FBOMB_EXPL4, 0},
-	{"S_FBOMB_EXPL4", 0, SPR_BARX, 2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_FBOMB_EXPL5, 0},
-	{"S_FBOMB_EXPL5", 0, SPR_BARX, 3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_FBOMB_EXPL6, 0},
-	{"S_FBOMB_EXPL6", 0, SPR_NULL, 0, 2*TICRATE, {NULL}, 0, 0, S_NULL, 0},
-	{"S_TNTDUST_1", 0, SPR_BARD, 0|FF_TRANS90, 2, {NULL}, 0, 0, S_TNTDUST_2, 0},
-	{"S_TNTDUST_2", 0, SPR_BARD, 0|FF_TRANS30, 2*TICRATE, {A_SetRandomTics}, 2, TICRATE, S_TNTDUST_3, 0},
-	{"S_TNTDUST_3", 0, SPR_BARD, 0|FF_TRANS40, 10, {NULL}, 0, 0, S_TNTDUST_4, 0},
-	{"S_TNTDUST_4", 0, SPR_BARD, 0|FF_TRANS50, 10, {NULL}, 0, 0, S_TNTDUST_5, 0},
-	{"S_TNTDUST_5", 0, SPR_BARD, 0|FF_TRANS60, 10, {NULL}, 0, 0, S_TNTDUST_6, 0},
-	{"S_TNTDUST_6", 0, SPR_BARD, 0|FF_TRANS70, 10, {NULL}, 0, 0, S_TNTDUST_7, 0},
-	{"S_TNTDUST_7", 0, SPR_BARD, 0|FF_TRANS80, 10, {NULL}, 0, 0, S_TNTDUST_8, 0},
-	{"S_TNTDUST_8", 0, SPR_BARD, 0|FF_TRANS90, 10, {NULL}, 0, 0, S_NULL, 0},
-	{"S_FSGNA", 0, SPR_FSGN, 0|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_FSGNB", 0, SPR_FSGN, 1|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_FSGNC", 0, SPR_FSGN, 2|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_FSGND", 0, SPR_FSGN, 3|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"FANG_SETUP", 0, SPR_NULL, 0, 2, {A_CheckFlags2}, MF2_AMBUSH, S_FANG_IDLE0, S_FANG_INTRO0, 0},
+
+	{"FANG_INTRO0", 0, SPR_NULL, 0, 2, {NULL}, 0, 0, S_FANG_INTRO1, 0},
+	{"FANG_INTRO1", 0, SPR_NULL, 0, 2, {A_Boss5MakeJunk}, -S_FANG_CLONE1, 0, S_FANG_INTRO2, 0},
+	{"FANG_INTRO2", 0, SPR_NULL, 0, 0, {A_Repeat}, 25, S_FANG_INTRO1, S_FANG_INTRO3, 0},
+	{"FANG_INTRO3", 0, SPR_NULL, 0, 0, {A_Boss5MakeJunk}, 0, 1, S_FANG_INTRO4, 0},
+	{"FANG_INTRO4", 0, SPR_FANG, 30, 1, {A_ZThrust}, 9, (1<<16)|1, S_FANG_INTRO5, 0},
+	{"FANG_INTRO5", 0, SPR_FANG, 27, 1, {A_Boss5CheckOnGround}, S_FANG_INTRO9, 0, S_FANG_INTRO6, 0},
+	{"FANG_INTRO6", 0, SPR_FANG, 28, 1, {A_Boss5CheckOnGround}, S_FANG_INTRO9, 0, S_FANG_INTRO7, 0},
+	{"FANG_INTRO7", 0, SPR_FANG, 29, 1, {A_Boss5CheckOnGround}, S_FANG_INTRO9, 0, S_FANG_INTRO8, 0},
+	{"FANG_INTRO8", 0, SPR_FANG, 30, 1, {A_Boss5CheckOnGround}, S_FANG_INTRO9, 0, S_FANG_INTRO5, 0},
+	{"FANG_INTRO9", 0, SPR_FANG, 23|FF_ANIMATE, 50, {NULL}, 1, 4, S_FANG_INTRO10, 0},
+	{"FANG_INTRO10", 0, SPR_FANG, 25, 5, {NULL}, 0, 0, S_FANG_INTRO11, 0},
+	{"FANG_INTRO11", 0, SPR_FANG, 26, 2, {A_Boss5MakeJunk}, S_BROKENROBOTD, 2, S_FANG_INTRO12, 0},
+	{"FANG_INTRO12", 0, SPR_FANG, 31|FF_ANIMATE, 50, {NULL}, 3, 4, S_FANG_IDLE1, 0},
+
+	{"FANG_CLONE1", 0, SPR_FANG, 11, 2, {A_Boss5MakeJunk}, 0, -1, S_FANG_CLONE2, 0},
+	{"FANG_INTRO2", 0, SPR_FANG, 11, 0, {A_Repeat}, 49, S_FANG_CLONE1, S_FANG_CLONE3, 0},
+	{"FANG_CLONE3", 0, SPR_FANG, 12, 0, {A_SetObjectFlags}, MF_NOGRAVITY, 1, S_FANG_CLONE4, 0},
+	{"FANG_CLONE4", 0, SPR_FANG, 12, 1, {A_Boss5CheckOnGround}, S_FANG_IDLE0, 0, S_FANG_CLONE4, 0},
+
+	{"FANG_IDLE0", 0, SPR_FANG, 0,  0, {A_SetObjectFlags}, MF_NOCLIPTHING, 1, S_FANG_IDLE1, 0},
+	{"FANG_IDLE1", 0, SPR_FANG, 2, 16, {A_Look}, 1, 0, S_FANG_IDLE2, 0},
+	{"FANG_IDLE2", 0, SPR_FANG, 3, 16, {A_Look}, 1, 0, S_FANG_IDLE3, 0},
+	{"FANG_IDLE3", 0, SPR_FANG, 3, 16, {A_Look}, 1, 0, S_FANG_IDLE4, 0},
+	{"FANG_IDLE4", 0, SPR_FANG, 3, 16, {A_Look}, 1, 0, S_FANG_IDLE5, 0},
+	{"FANG_IDLE5", 0, SPR_FANG, 2, 16, {A_Look}, 1, 0, S_FANG_IDLE6, 0},
+	{"FANG_IDLE6", 0, SPR_FANG, 1, 16, {A_Look}, 1, 0, S_FANG_IDLE7, 0},
+	{"FANG_IDLE7", 0, SPR_FANG, 1, 16, {A_Look}, 1, 0, S_FANG_IDLE8, 0},
+	{"FANG_IDLE8", 0, SPR_FANG, 1, 16, {A_Look}, 1, 0, S_FANG_IDLE1, 0},
+
+	{"FANG_PAIN1", 0, SPR_FANG, 14, 0, {A_DoNPCPain}, FRACUNIT, 0, S_FANG_PAIN2, 0},
+	{"FANG_PAIN2", 0, SPR_FANG, 14, 1, {A_Boss5CheckOnGround}, S_FANG_PATHINGSTART1, S_FANG_PINCHPATHINGSTART1, S_FANG_PAIN2, 0},
+
+	{"FANG_PATHINGSTART1", 0, SPR_FANG,  8, 0, {A_Boss5ExtraRepeat}, 5, 4, S_FANG_PATHINGSTART2, 0},
+	{"FANG_PATHINGSTART2", 0, SPR_FANG,  8, 0, {A_PlayActiveSound}, 0, 0, S_FANG_PATHING, 0},
+	{"FANG_PATHING", 0, SPR_FANG,  8, 0, {A_Boss5FindWaypoint}, 0, 0, S_FANG_BOUNCE1, 0},
+
+	{"FANG_BOUNCE1", 0, SPR_FANG,  8, 2, {A_Thrust}, 0, 1, S_FANG_BOUNCE2, 0},
+	{"FANG_BOUNCE2", 0, SPR_FANG,  9, 2, {NULL}, 0, 0, S_FANG_BOUNCE3, 0},
+	{"FANG_BOUNCE3", 0, SPR_FANG, 10, 1, {A_Boss5Jump}, 0, 0, S_FANG_BOUNCE4, 0},
+	{"FANG_BOUNCE4", 0, SPR_FANG, 10, 1, {A_Boss5CheckFalling}, S_FANG_CHECKPATH1, S_FANG_FALL1, S_FANG_BOUNCE4, 0},
+
+	{"FANG_FALL1", 0, SPR_FANG, 12, 1, {A_Boss5CheckOnGround}, S_FANG_CHECKPATH1, 0, S_FANG_FALL2, 0},
+	{"FANG_FALL2", 0, SPR_FANG, 13, 1, {A_Boss5CheckOnGround}, S_FANG_CHECKPATH1, 0, S_FANG_FALL1, 0},
+
+	{"FANG_CHECKPATH1", 0, SPR_FANG,  8, 0, {A_Boss5Calm}, 0, 0, S_FANG_CHECKPATH2, 0},
+	{"FANG_CHECKPATH2", 0, SPR_FANG,  8, 0, {A_Repeat}, 0, S_FANG_PATHINGCONT1, S_FANG_SKID1, 0},
+
+	{"FANG_PATHINGCONT1", 0, SPR_FANG,  9, 0, {A_Boss5PinchShot}, MT_FBOMB, -16, S_FANG_PATHINGCONT2, 0},
+	{"FANG_PATHINGCONT2", 0, SPR_FANG,  9, 0, {A_PlayActiveSound}, 0, 0, S_FANG_PATHINGCONT3, 0},
+	{"FANG_PATHINGCONT3", 0, SPR_FANG,  9, 2, {A_Thrust}, 0, 1, S_FANG_PATHING, 0},
+
+	{"FANG_SKID1", 0, SPR_FANG,  4,  0, {A_PlayAttackSound}, 0, 0, S_FANG_SKID2, 0},
+	{"FANG_SKID2", 0, SPR_FANG,  4,  1, {A_DoNPCSkid}, S_FANG_SKID3, 0, S_FANG_SKID2, 0},
+	{"FANG_SKID3", 0, SPR_FANG,  4, 10, {NULL}, 0, 0, S_FANG_CHOOSEATTACK, 0},
+
+	{"FANG_CHOOSEATTACK", 0, SPR_FANG,  0, 0, {A_RandomState}, S_FANG_LOBSHOT0, S_FANG_FIRESTART1, S_NULL, 0},
+
+	{"FANG_FIRESTART1", 0, SPR_FANG,  5,  0, {A_PrepareRepeat}, 3, 0, S_FANG_FIRESTART2, 0},  // Reset loop
+	{"FANG_FIRESTART2", 0, SPR_FANG,  5, 18, {A_LookForBetter}, 1, 0, S_FANG_FIRE1, 0},
+	{"FANG_FIRE1", 0, SPR_FANG,  5,  5, {A_FireShot}, MT_CORK, -16, S_FANG_FIRE2, 0},  // Start of loop
+	{"FANG_FIRE2", 0, SPR_FANG,  6,  5, {NULL}, 0, 0, S_FANG_FIRE3, 0},
+	{"FANG_FIRE3", 0, SPR_FANG,  7,  5, {NULL}, 0, 0, S_FANG_FIRE4, 0},
+	{"FANG_FIRE4", 0, SPR_FANG,  5,  5, {NULL}, 2, 0, S_FANG_FIREREPEAT, 0},
+	{"FANG_FIREREPEAT", 0, SPR_FANG,  5,  0, {A_Repeat}, 3, S_FANG_FIRE1, S_FANG_WAIT1, 0},  // End of loop
+
+	{"FANG_LOBSHOT0", 0, SPR_FANG, 18, 16, {A_LookForBetter}, 1, 0, S_FANG_LOBSHOT1, 0},
+	{"FANG_LOBSHOT1", 0, SPR_FANG, 19,  2, {A_LookForBetter}, 1, 0, S_FANG_LOBSHOT2, 0},
+	{"FANG_LOBSHOT2", 0, SPR_FANG, 20, 18, {A_BrakLobShot}, MT_FBOMB, 32+(1<<16), S_FANG_WAIT1, 0},
+
+	{"FANG_WAIT1", 0, SPR_FANG, FF_ANIMATE|15, 70, {NULL}, 1, 5, S_FANG_WAIT2, 0},
+	{"FANG_WAIT2", 0, SPR_FANG,             0, 35, {A_Look}, 1, 0, S_FANG_IDLE1, 0},
+
+	{"FANG_WALLHIT", 0, SPR_FANG, 12, 1, {A_Boss5CheckOnGround}, S_FANG_PATHINGSTART2, S_FANG_PINCHPATHINGSTART1, S_FANG_WALLHIT, 0},
+
+	{"FANG_PINCHPATHINGSTART1", 0, SPR_FANG,  8,  0, {A_PrepareRepeat}, 1, 0, S_FANG_PINCHPATHINGSTART2, 0},
+	{"FANG_PINCHPATHINGSTART2", 0, SPR_FANG,  8,  0, {A_PlayActiveSound}, 0, 0, S_FANG_PINCHPATHING, 0},
+	{"FANG_PINCHPATHING", 0, SPR_FANG,  8,  0, {A_Boss5FindWaypoint}, 1, 0, S_FANG_PINCHBOUNCE0, 0},
+	{"FANG_PINCHBOUNCE0", 0, SPR_FANG,  8,  0, {A_SetObjectFlags}, MF_NOCLIP|MF_NOCLIPHEIGHT, 2, S_FANG_PINCHBOUNCE1, 0},
+	{"FANG_PINCHBOUNCE1", 0, SPR_FANG,  8,  2, {A_Thrust}, 0, 1, S_FANG_PINCHBOUNCE2, 0},
+	{"FANG_PINCHBOUNCE2", 0, SPR_FANG,  9,  2, {NULL}, 0, 0, S_FANG_PINCHBOUNCE3, 0},
+	{"FANG_PINCHBOUNCE3", 0, SPR_FANG, 10,  2, {A_Boss5Jump}, 0, 0, S_FANG_PINCHBOUNCE4, 0},
+	{"FANG_PINCHBOUNCE4", 0, SPR_FANG, 10,  1, {A_Boss5CheckFalling}, S_FANG_PINCHSKID1, S_FANG_PINCHFALL0, S_FANG_PINCHBOUNCE4, 0},
+	{"FANG_PINCHFALL0", 0, SPR_FANG, 12,  0, {A_SetObjectFlags}, MF_NOCLIP|MF_NOCLIPHEIGHT, 1, S_FANG_PINCHFALL1, 0},
+	{"FANG_PINCHFALL1", 0, SPR_FANG, 12,  1, {A_Boss5CheckOnGround}, S_FANG_PINCHSKID1, 0, S_FANG_PINCHFALL2, 0},
+	{"FANG_PINCHFALL2", 0, SPR_FANG, 13,  1, {A_Boss5CheckOnGround}, S_FANG_PINCHSKID1, 0, S_FANG_PINCHFALL1, 0},
+	{"FANG_PINCHSKID1", 0, SPR_FANG,  4,  0, {A_PlayAttackSound}, 0, 0, S_FANG_PINCHSKID2, 0},
+	{"FANG_PINCHSKID2", 0, SPR_FANG,  4,  1, {A_DoNPCSkid}, S_FANG_PINCHLOBSHOT0, 0, S_FANG_PINCHSKID2, 0},
+	{"FANG_PINCHLOBSHOT0", 0, SPR_FANG, 18, 16, {A_FaceTarget}, 3, 0, S_FANG_PINCHLOBSHOT1, 0},
+	{"FANG_PINCHLOBSHOT1", 0, SPR_FANG, 19,  2, {A_FaceTarget}, 3, 0, S_FANG_PINCHLOBSHOT2, 0},
+	{"FANG_PINCHLOBSHOT2", 0, SPR_FANG, 20, 30, {A_Boss5MakeItRain}, MT_FBOMB, -16, S_FANG_PINCHLOBSHOT3, 0},
+	{"FANG_PINCHLOBSHOT3", 0, SPR_FANG, 20, 18, {A_LinedefExecuteFromArg}, 4, 0, S_FANG_PINCHLOBSHOT4, 0},
+	{"FANG_PINCHLOBSHOT4", 0, SPR_FANG,  0,  0, {A_Boss5Calm}, 0, 0, S_FANG_PATHINGSTART1, 0},
+
+	{"FANG_DIE1", 0, SPR_FANG, 21, 0, {A_DoNPCPain},                    0, 0, S_FANG_DIE2, 0},
+	{"FANG_DIE2", 0, SPR_FANG, 21, 1, {A_Boss5CheckOnGround}, S_FANG_DIE3, 0, S_FANG_DIE2, 0},
+
+	{"FANG_DIE3", 0, SPR_FANG, 22,  0, {A_Scream}, 0, 0, S_FANG_DIE4, 0},
+	{"FANG_DIE4", 0, SPR_FANG, 22, -1, {A_SetFuse}, 70, 0, S_FANG_DIE5, 0},
+
+	{"FANG_DIE5", 0, SPR_FANG, 11, 0, {A_PlaySound}, sfx_jump, 0, S_FANG_DIE6, 0},
+	{"FANG_DIE6", 0, SPR_FANG, 11, 1, {A_ZThrust}, 6, (1<<16)|1, S_FANG_DIE7, 0},
+	{"FANG_DIE7", 0, SPR_FANG, 11, 1, {A_Boss5CheckFalling}, S_FANG_FLEEPATHING1, S_FANG_DIE8, S_FANG_DIE7, 0},
+	{"FANG_DIE8", 0, SPR_FANG, 12, 1, {A_Boss5CheckOnGround}, S_FANG_FLEEPATHING1, 0, S_FANG_DIE8, 0},
+
+	{"FANG_FLEEPATHING1", 0, SPR_FANG,  9,  0, {A_PlayActiveSound}, 0, 0, S_FANG_FLEEPATHING2, 0},
+	{"FANG_FLEEPATHING2", 0, SPR_FANG,  8,  2, {A_Boss5FindWaypoint}, 2, 0, S_FANG_FLEEBOUNCE1, 0},
+	{"FANG_FLEEBOUNCE1", 0, SPR_FANG,  9,  2, {NULL}, 0, 0, S_FANG_FLEEBOUNCE2, 0},
+	{"FANG_FLEEBOUNCE2", 0, SPR_FANG, 10, -1, {A_BossDeath}, 0, 0, S_NULL, 0},
+
+	{"FANG_KO", 0, SPR_FANG, 17, 7*TICRATE, {NULL}, 0, 0, S_NULL, 0},
+
+	{"BROKENROBOTRANDOM", 0, SPR_NULL, 0, -1, {A_RandomStateRange}, S_BROKENROBOTA, S_BROKENROBOTF, S_NULL, 0},
+	{"BROKENROBOTA", 0, SPR_BRKN,    FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 3, 4, S_NULL, 0},
+	{"BROKENROBOTB", 0, SPR_BRKN,  4|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 3, 4, S_NULL, 0},
+	{"BROKENROBOTC", 0, SPR_BRKN,  8|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 3, 4, S_NULL, 0},
+	{"BROKENROBOTD", 0, SPR_BRKN, 12|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 3, 4, S_NULL, 0},
+	{"BROKENROBOTE", 0, SPR_BRKN, 16|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 3, 4, S_NULL, 0},
+	{"BROKENROBOTF", 0, SPR_BRKN, 20|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 3, 4, S_NULL, 0},
+
+	{"ALART1", 0, SPR_WHAT,   FF_ANIMATE|FF_FULLBRIGHT,  4, {NULL}, 1, 2, S_ALART2, 0},
+	{"ALART2", 0, SPR_WHAT, 2|FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 1, 2, S_NULL, 0},
+
+	{"VWREF", 0, SPR_VWRE,   FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"VWREB", 0, SPR_VWRE, 1|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
+
+	{"PROJECTORLIGHT1", 0, SPR_PROJ,   FF_TRANS20|FF_FULLBRIGHT,  4, {NULL}, 0, 0, S_PROJECTORLIGHT2, 0},
+	{"PROJECTORLIGHT2", 0, SPR_PROJ, 1|FF_TRANS40|FF_FULLBRIGHT,  1, {NULL}, 0, 0, S_PROJECTORLIGHT3, 0},
+	{"PROJECTORLIGHT3", 0, SPR_PROJ, 2|FF_TRANS20|FF_FULLBRIGHT,  1, {NULL}, 0, 0, S_PROJECTORLIGHT4, 0},
+	{"PROJECTORLIGHT4", 0, SPR_PROJ, 3|FF_TRANS40|FF_FULLBRIGHT,  2, {A_Repeat}, 39, S_PROJECTORLIGHT2, S_PROJECTORLIGHT5, 0},
+	{"PROJECTORLIGHT5", 0, SPR_PROJ, 4|FF_TRANS60|FF_FULLBRIGHT,  2, {NULL}, 0, 0, S_NULL, 0},
+
+	{"FBOMB1", 0, SPR_FBOM, 0, 1, {A_GhostMe}, 0, 0, S_FBOMB2, 0},
+	{"FBOMB2", 0, SPR_FBOM, 1, 1, {A_GhostMe}, 0, 0, S_FBOMB1, 0},
+	{"FBOMB_EXPL1", 0, SPR_BARX, 0|FF_FULLBRIGHT, 3, {A_SetObjectFlags}, MF_NOCLIP|MF_NOGRAVITY|MF_NOBLOCKMAP, 0, S_FBOMB_EXPL2, 0},
+	{"FBOMB_EXPL2", 0, SPR_BARX, 1|FF_FULLBRIGHT, 2, {A_Boss5BombExplode}, MT_TNTDUST, 0, S_FBOMB_EXPL3, 0},
+	{"FBOMB_EXPL3", 0, SPR_BARX, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_FBOMB_EXPL4, 0},
+	{"FBOMB_EXPL4", 0, SPR_BARX, 2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_FBOMB_EXPL5, 0},
+	{"FBOMB_EXPL5", 0, SPR_BARX, 3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_FBOMB_EXPL6, 0},
+	{"FBOMB_EXPL6", 0, SPR_NULL, 0, 2*TICRATE, {NULL}, 0, 0, S_NULL, 0},
+	{"TNTDUST_1", 0, SPR_BARD, 0|FF_TRANS90, 2, {NULL}, 0, 0, S_TNTDUST_2, 0},
+	{"TNTDUST_2", 0, SPR_BARD, 0|FF_TRANS30, 2*TICRATE, {A_SetRandomTics}, 2, TICRATE, S_TNTDUST_3, 0},
+	{"TNTDUST_3", 0, SPR_BARD, 0|FF_TRANS40, 10, {NULL}, 0, 0, S_TNTDUST_4, 0},
+	{"TNTDUST_4", 0, SPR_BARD, 0|FF_TRANS50, 10, {NULL}, 0, 0, S_TNTDUST_5, 0},
+	{"TNTDUST_5", 0, SPR_BARD, 0|FF_TRANS60, 10, {NULL}, 0, 0, S_TNTDUST_6, 0},
+	{"TNTDUST_6", 0, SPR_BARD, 0|FF_TRANS70, 10, {NULL}, 0, 0, S_TNTDUST_7, 0},
+	{"TNTDUST_7", 0, SPR_BARD, 0|FF_TRANS80, 10, {NULL}, 0, 0, S_TNTDUST_8, 0},
+	{"TNTDUST_8", 0, SPR_BARD, 0|FF_TRANS90, 10, {NULL}, 0, 0, S_NULL, 0},
+	{"FSGNA", 0, SPR_FSGN, 0|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"FSGNB", 0, SPR_FSGN, 1|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"FSGNC", 0, SPR_FSGN, 2|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"FSGND", 0, SPR_FSGN, 3|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Black Eggman (Boss 7)
-	{"S_BLACKEGG_STND", 0, SPR_BRAK, 0, 1, {A_SetReactionTime}, 0, 0, S_BLACKEGG_STND2, 0},
-	{"S_BLACKEGG_STND2", 0, SPR_BRAK, 0, 7, {A_Look}, 1, 0, S_BLACKEGG_STND2, 0},
-	{"S_BLACKEGG_WALK1", 0, SPR_BRAK, 1, 7, {NULL}, 0, 0, S_BLACKEGG_WALK2, 0},
-	{"S_BLACKEGG_WALK2", 0, SPR_BRAK, 2, 7, {NULL}, 0, 0, S_BLACKEGG_WALK3, 0},
-	{"S_BLACKEGG_WALK3", 0, SPR_BRAK, 3, 7, {A_PlaySound}, sfx_bestep, 0, S_BLACKEGG_WALK4, 0},
-	{"S_BLACKEGG_WALK4", 0, SPR_BRAK, 4, 7, {NULL}, 0, 0, S_BLACKEGG_WALK5, 0},
-	{"S_BLACKEGG_WALK5", 0, SPR_BRAK, 5, 7, {NULL}, 0, 0, S_BLACKEGG_WALK6, 0},
-	{"S_BLACKEGG_WALK6", 0, SPR_BRAK, 6, 7, {A_PlaySound}, sfx_bestp2, 0, S_BLACKEGG_WALK1, 0},
-	{"S_BLACKEGG_SHOOT1", 0, SPR_BRAK, 7, 3, {NULL}, 0, 0, S_BLACKEGG_SHOOT2, 0},
-	{"S_BLACKEGG_SHOOT2", 0, SPR_BRAK, 24, 1, {A_PlaySound}, sfx_befire, 0, S_BLACKEGG_SHOOT1, 0},
-
-	{"S_BLACKEGG_PAIN1", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN2, 0},
-	{"S_BLACKEGG_PAIN2", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN3, 0},
-	{"S_BLACKEGG_PAIN3", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN4, 0},
-	{"S_BLACKEGG_PAIN4", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN5, 0},
-	{"S_BLACKEGG_PAIN5", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN6, 0},
-	{"S_BLACKEGG_PAIN6", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN7, 0},
-	{"S_BLACKEGG_PAIN7", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN8, 0},
-	{"S_BLACKEGG_PAIN8", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN9, 0},
-	{"S_BLACKEGG_PAIN9", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN10, 0},
-	{"S_BLACKEGG_PAIN10", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN11, 0},
-	{"S_BLACKEGG_PAIN11", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN12, 0},
-	{"S_BLACKEGG_PAIN12", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN13, 0},
-	{"S_BLACKEGG_PAIN13", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN14, 0},
-	{"S_BLACKEGG_PAIN14", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN15, 0},
-	{"S_BLACKEGG_PAIN15", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN16, 0},
-	{"S_BLACKEGG_PAIN16", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN17, 0},
-	{"S_BLACKEGG_PAIN17", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN18, 0},
-	{"S_BLACKEGG_PAIN18", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN19, 0},
-	{"S_BLACKEGG_PAIN19", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN20, 0},
-	{"S_BLACKEGG_PAIN20", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN21, 0},
-	{"S_BLACKEGG_PAIN21", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN22, 0},
-	{"S_BLACKEGG_PAIN22", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN23, 0},
-	{"S_BLACKEGG_PAIN23", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN24, 0},
-	{"S_BLACKEGG_PAIN24", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN25, 0},
-	{"S_BLACKEGG_PAIN25", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN26, 0},
-	{"S_BLACKEGG_PAIN26", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN27, 0},
-	{"S_BLACKEGG_PAIN27", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN28, 0},
-	{"S_BLACKEGG_PAIN28", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN29, 0},
-	{"S_BLACKEGG_PAIN29", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN30, 0},
-	{"S_BLACKEGG_PAIN30", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN31, 0},
-	{"S_BLACKEGG_PAIN31", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN32, 0},
-	{"S_BLACKEGG_PAIN32", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN33, 0},
-	{"S_BLACKEGG_PAIN33", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN34, 0},
-	{"S_BLACKEGG_PAIN34", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN35, 0},
-	{"S_BLACKEGG_PAIN35", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_WALK1, 0},
-
-	{"S_BLACKEGG_HITFACE1", 0, SPR_BRAK, 9, 20, {NULL}, 0, 0, S_BLACKEGG_HITFACE2, 0},
-	{"S_BLACKEGG_HITFACE2", 0, SPR_BRAK, 10, 2, {NULL}, 0, 0, S_BLACKEGG_HITFACE3, 0},
-	{"S_BLACKEGG_HITFACE3", 0, SPR_BRAK, 11, 2, {NULL}, 0, 0, S_BLACKEGG_HITFACE4, 0},
-	{"S_BLACKEGG_HITFACE4", 0, SPR_BRAK, 12,14, {NULL}, 0, 0, S_BLACKEGG_PAIN1, 0},
-
-	{"S_BLACKEGG_DIE1", 0, SPR_BRAK, 13, 14, {NULL}, 0, 0, S_BLACKEGG_DIE2, 0},
-	{"S_BLACKEGG_DIE2", 0, SPR_BRAK, 14, 7, {NULL}, 0, 0, S_BLACKEGG_DIE3, 0},
-	{"S_BLACKEGG_DIE3", 0, SPR_BRAK, 15, 5, {NULL}, 0, 0, S_BLACKEGG_DIE4, 0},
-	{"S_BLACKEGG_DIE4", 0, SPR_BRAK, 16, 3, {A_PlaySound}, sfx_bgxpld, 0, S_BLACKEGG_DIE5, 0},
-	{"S_BLACKEGG_DIE5", 0, SPR_BRAK, 17, -1, {NULL}, 0, 0, S_BLACKEGG_DIE5, 0},
-
-	{"S_BLACKEGG_MISSILE1", 0, SPR_BRAK, 18, 14, {NULL}, 0, 0, S_BLACKEGG_MISSILE2, 0},
-	{"S_BLACKEGG_MISSILE2", 0, SPR_BRAK, 19, 5, {NULL}, 0, 0, S_BLACKEGG_MISSILE3, 0},
-	{"S_BLACKEGG_MISSILE3", 0, SPR_BRAK, 20, 35, {A_Boss7FireMissiles}, MT_BLACKEGGMAN_MISSILE, sfx_beshot, S_BLACKEGG_JUMP1, 0},
-
-	{"S_BLACKEGG_GOOP", 0, SPR_BRAK, 21, -1, {NULL}, 0, 0, S_BLACKEGG_STND, 0},
-
-	{"S_BLACKEGG_JUMP1", 0, SPR_BRAK, 22, 14, {A_PlaySound}, sfx_belnch, 0, S_BLACKEGG_JUMP2, 0},
-	{"S_BLACKEGG_JUMP2", 0, SPR_BRAK, 23, -1, {NULL}, 0, 0, S_BLACKEGG_WALK1, 0},
-
-	{"S_BLACKEGG_DESTROYPLAT1", 0, SPR_BRAK, 21, 3*TICRATE, {NULL}, 0, 0, S_BLACKEGG_DESTROYPLAT2, 0},
-	{"S_BLACKEGG_DESTROYPLAT2", 0, SPR_BRAK, 21, 1, {A_PlaySound}, sfx_s3k54, 0, S_BLACKEGG_DESTROYPLAT3, 0},
-	{"S_BLACKEGG_DESTROYPLAT3", 0, SPR_BRAK, 21, 14, {A_LinedefExecuteFromArg}, 5, 0, S_BLACKEGG_STND, 0},
-
-	{"S_BLACKEGG_HELPER", 0, SPR_NULL, 0, 1, {A_CapeChase}, (160 - 20) << 16, 0, S_BLACKEGG_HELPER, 0},
-
-	{"S_BLACKEGG_GOOP1", 0, SPR_BGOO, FF_TRANS50  , 2, {NULL}, 0, 0, S_BLACKEGG_GOOP2, 0},
-	{"S_BLACKEGG_GOOP2", 0, SPR_BGOO, FF_TRANS50|1, 2, {NULL}, 0, 0, S_BLACKEGG_GOOP1, 0},
-	{"S_BLACKEGG_GOOP3", 0, SPR_BGOO, FF_TRANS50|2, 6*TICRATE, {A_GoopSplat}, 0, 0, S_BLACKEGG_GOOP4, 0},
-	{"S_BLACKEGG_GOOP4", 0, SPR_BGOO, FF_TRANS60|2, 4, {NULL}, 0, 0, S_BLACKEGG_GOOP5, 0},
-	{"S_BLACKEGG_GOOP5", 0, SPR_BGOO, FF_TRANS70|2, 4, {NULL}, 0, 0, S_BLACKEGG_GOOP6, 0},
-	{"S_BLACKEGG_GOOP6", 0, SPR_BGOO, FF_TRANS80|2, 4, {NULL}, 0, 0, S_BLACKEGG_GOOP7, 0},
-	{"S_BLACKEGG_GOOP7", 0, SPR_BGOO, FF_TRANS90|2, 4, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_BLACKEGG_MISSILE", 0, SPR_BMSL, 0, 1, {NULL}, 0, 0, S_BLACKEGG_MISSILE, 0},
+	{"BLACKEGG_STND", 0, SPR_BRAK, 0, 1, {A_SetReactionTime}, 0, 0, S_BLACKEGG_STND2, 0},
+	{"BLACKEGG_STND2", 0, SPR_BRAK, 0, 7, {A_Look}, 1, 0, S_BLACKEGG_STND2, 0},
+	{"BLACKEGG_WALK1", 0, SPR_BRAK, 1, 7, {NULL}, 0, 0, S_BLACKEGG_WALK2, 0},
+	{"BLACKEGG_WALK2", 0, SPR_BRAK, 2, 7, {NULL}, 0, 0, S_BLACKEGG_WALK3, 0},
+	{"BLACKEGG_WALK3", 0, SPR_BRAK, 3, 7, {A_PlaySound}, sfx_bestep, 0, S_BLACKEGG_WALK4, 0},
+	{"BLACKEGG_WALK4", 0, SPR_BRAK, 4, 7, {NULL}, 0, 0, S_BLACKEGG_WALK5, 0},
+	{"BLACKEGG_WALK5", 0, SPR_BRAK, 5, 7, {NULL}, 0, 0, S_BLACKEGG_WALK6, 0},
+	{"BLACKEGG_WALK6", 0, SPR_BRAK, 6, 7, {A_PlaySound}, sfx_bestp2, 0, S_BLACKEGG_WALK1, 0},
+	{"BLACKEGG_SHOOT1", 0, SPR_BRAK, 7, 3, {NULL}, 0, 0, S_BLACKEGG_SHOOT2, 0},
+	{"BLACKEGG_SHOOT2", 0, SPR_BRAK, 24, 1, {A_PlaySound}, sfx_befire, 0, S_BLACKEGG_SHOOT1, 0},
+
+	{"BLACKEGG_PAIN1", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN2, 0},
+	{"BLACKEGG_PAIN2", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN3, 0},
+	{"BLACKEGG_PAIN3", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN4, 0},
+	{"BLACKEGG_PAIN4", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN5, 0},
+	{"BLACKEGG_PAIN5", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN6, 0},
+	{"BLACKEGG_PAIN6", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN7, 0},
+	{"BLACKEGG_PAIN7", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN8, 0},
+	{"BLACKEGG_PAIN8", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN9, 0},
+	{"BLACKEGG_PAIN9", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN10, 0},
+	{"BLACKEGG_PAIN10", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN11, 0},
+	{"BLACKEGG_PAIN11", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN12, 0},
+	{"BLACKEGG_PAIN12", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN13, 0},
+	{"BLACKEGG_PAIN13", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN14, 0},
+	{"BLACKEGG_PAIN14", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN15, 0},
+	{"BLACKEGG_PAIN15", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN16, 0},
+	{"BLACKEGG_PAIN16", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN17, 0},
+	{"BLACKEGG_PAIN17", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN18, 0},
+	{"BLACKEGG_PAIN18", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN19, 0},
+	{"BLACKEGG_PAIN19", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN20, 0},
+	{"BLACKEGG_PAIN20", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN21, 0},
+	{"BLACKEGG_PAIN21", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN22, 0},
+	{"BLACKEGG_PAIN22", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN23, 0},
+	{"BLACKEGG_PAIN23", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN24, 0},
+	{"BLACKEGG_PAIN24", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN25, 0},
+	{"BLACKEGG_PAIN25", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN26, 0},
+	{"BLACKEGG_PAIN26", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN27, 0},
+	{"BLACKEGG_PAIN27", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN28, 0},
+	{"BLACKEGG_PAIN28", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN29, 0},
+	{"BLACKEGG_PAIN29", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN30, 0},
+	{"BLACKEGG_PAIN30", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN31, 0},
+	{"BLACKEGG_PAIN31", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN32, 0},
+	{"BLACKEGG_PAIN32", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN33, 0},
+	{"BLACKEGG_PAIN33", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN34, 0},
+	{"BLACKEGG_PAIN34", 0, SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN35, 0},
+	{"BLACKEGG_PAIN35", 0, SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_WALK1, 0},
+
+	{"BLACKEGG_HITFACE1", 0, SPR_BRAK, 9, 20, {NULL}, 0, 0, S_BLACKEGG_HITFACE2, 0},
+	{"BLACKEGG_HITFACE2", 0, SPR_BRAK, 10, 2, {NULL}, 0, 0, S_BLACKEGG_HITFACE3, 0},
+	{"BLACKEGG_HITFACE3", 0, SPR_BRAK, 11, 2, {NULL}, 0, 0, S_BLACKEGG_HITFACE4, 0},
+	{"BLACKEGG_HITFACE4", 0, SPR_BRAK, 12,14, {NULL}, 0, 0, S_BLACKEGG_PAIN1, 0},
+
+	{"BLACKEGG_DIE1", 0, SPR_BRAK, 13, 14, {NULL}, 0, 0, S_BLACKEGG_DIE2, 0},
+	{"BLACKEGG_DIE2", 0, SPR_BRAK, 14, 7, {NULL}, 0, 0, S_BLACKEGG_DIE3, 0},
+	{"BLACKEGG_DIE3", 0, SPR_BRAK, 15, 5, {NULL}, 0, 0, S_BLACKEGG_DIE4, 0},
+	{"BLACKEGG_DIE4", 0, SPR_BRAK, 16, 3, {A_PlaySound}, sfx_bgxpld, 0, S_BLACKEGG_DIE5, 0},
+	{"BLACKEGG_DIE5", 0, SPR_BRAK, 17, -1, {NULL}, 0, 0, S_BLACKEGG_DIE5, 0},
+
+	{"BLACKEGG_MISSILE1", 0, SPR_BRAK, 18, 14, {NULL}, 0, 0, S_BLACKEGG_MISSILE2, 0},
+	{"BLACKEGG_MISSILE2", 0, SPR_BRAK, 19, 5, {NULL}, 0, 0, S_BLACKEGG_MISSILE3, 0},
+	{"BLACKEGG_MISSILE3", 0, SPR_BRAK, 20, 35, {A_Boss7FireMissiles}, MT_BLACKEGGMAN_MISSILE, sfx_beshot, S_BLACKEGG_JUMP1, 0},
+
+	{"BLACKEGG_GOOP", 0, SPR_BRAK, 21, -1, {NULL}, 0, 0, S_BLACKEGG_STND, 0},
+
+	{"BLACKEGG_JUMP1", 0, SPR_BRAK, 22, 14, {A_PlaySound}, sfx_belnch, 0, S_BLACKEGG_JUMP2, 0},
+	{"BLACKEGG_JUMP2", 0, SPR_BRAK, 23, -1, {NULL}, 0, 0, S_BLACKEGG_WALK1, 0},
+
+	{"BLACKEGG_DESTROYPLAT1", 0, SPR_BRAK, 21, 3*TICRATE, {NULL}, 0, 0, S_BLACKEGG_DESTROYPLAT2, 0},
+	{"BLACKEGG_DESTROYPLAT2", 0, SPR_BRAK, 21, 1, {A_PlaySound}, sfx_s3k54, 0, S_BLACKEGG_DESTROYPLAT3, 0},
+	{"BLACKEGG_DESTROYPLAT3", 0, SPR_BRAK, 21, 14, {A_LinedefExecuteFromArg}, 5, 0, S_BLACKEGG_STND, 0},
+
+	{"BLACKEGG_HELPER", 0, SPR_NULL, 0, 1, {A_CapeChase}, (160 - 20) << 16, 0, S_BLACKEGG_HELPER, 0},
+
+	{"BLACKEGG_GOOP1", 0, SPR_BGOO, FF_TRANS50  , 2, {NULL}, 0, 0, S_BLACKEGG_GOOP2, 0},
+	{"BLACKEGG_GOOP2", 0, SPR_BGOO, FF_TRANS50|1, 2, {NULL}, 0, 0, S_BLACKEGG_GOOP1, 0},
+	{"BLACKEGG_GOOP3", 0, SPR_BGOO, FF_TRANS50|2, 6*TICRATE, {A_GoopSplat}, 0, 0, S_BLACKEGG_GOOP4, 0},
+	{"BLACKEGG_GOOP4", 0, SPR_BGOO, FF_TRANS60|2, 4, {NULL}, 0, 0, S_BLACKEGG_GOOP5, 0},
+	{"BLACKEGG_GOOP5", 0, SPR_BGOO, FF_TRANS70|2, 4, {NULL}, 0, 0, S_BLACKEGG_GOOP6, 0},
+	{"BLACKEGG_GOOP6", 0, SPR_BGOO, FF_TRANS80|2, 4, {NULL}, 0, 0, S_BLACKEGG_GOOP7, 0},
+	{"BLACKEGG_GOOP7", 0, SPR_BGOO, FF_TRANS90|2, 4, {NULL}, 0, 0, S_NULL, 0},
+
+	{"BLACKEGG_MISSILE", 0, SPR_BMSL, 0, 1, {NULL}, 0, 0, S_BLACKEGG_MISSILE, 0},
 
 	// New Very-Last-Minute 2.1 Brak Eggman (Cy-Brak-demon)
-	{"S_CYBRAKDEMON_IDLE", 0, SPR_BRAK, 0, 10, {A_Look}, 0, 0, S_CYBRAKDEMON_IDLE, 0},
-	{"S_CYBRAKDEMON_WALK1", 0, SPR_BRAK, 1, 8, {A_BrakChase}, 3, 0, S_CYBRAKDEMON_WALK2, 0},
-	{"S_CYBRAKDEMON_WALK2", 0, SPR_BRAK, 2, 8, {A_BrakChase}, 3, 0, S_CYBRAKDEMON_WALK3, 0},
-	{"S_CYBRAKDEMON_WALK3", 0, SPR_BRAK, 3, 8, {A_BrakChase}, 3, sfx_bestep, S_CYBRAKDEMON_WALK4, 0},
-	{"S_CYBRAKDEMON_WALK4", 0, SPR_BRAK, 4, 8, {A_BrakChase}, 3, 0, S_CYBRAKDEMON_WALK5, 0},
-	{"S_CYBRAKDEMON_WALK5", 0, SPR_BRAK, 5, 8, {A_BrakChase}, 3, 0, S_CYBRAKDEMON_WALK6, 0},
-	{"S_CYBRAKDEMON_WALK6", 0, SPR_BRAK, 6, 8, {A_BrakChase}, 3, sfx_bestp2, S_CYBRAKDEMON_WALK1, 0},
-	{"S_CYBRAKDEMON_CHOOSE_ATTACK1", 0, SPR_BRAK, 7, 6, {A_RandomState}, S_CYBRAKDEMON_MISSILE_ATTACK1, S_CYBRAKDEMON_FLAME_ATTACK1, S_CYBRAKDEMON_MISSILE_ATTACK1, 0},
-	{"S_CYBRAKDEMON_MISSILE_ATTACK1", 0, SPR_BRAK, 7, 6, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_MISSILE_ATTACK2, 0},  // Aim
-	{"S_CYBRAKDEMON_MISSILE_ATTACK2", 0, SPR_BRAK, 26 + FF_FULLBRIGHT, 12, {A_BrakFireShot}, MT_CYBRAKDEMON_MISSILE, 128, S_CYBRAKDEMON_MISSILE_ATTACK3, 0},  // Fire
-	{"S_CYBRAKDEMON_MISSILE_ATTACK3", 0, SPR_BRAK, 7, 12, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_MISSILE_ATTACK4, 0},  // Aim
-	{"S_CYBRAKDEMON_MISSILE_ATTACK4", 0, SPR_BRAK, 26 + FF_FULLBRIGHT, 12, {A_BrakFireShot}, MT_CYBRAKDEMON_MISSILE, 128, S_CYBRAKDEMON_MISSILE_ATTACK5, 0},  // Fire
-	{"S_CYBRAKDEMON_MISSILE_ATTACK5", 0, SPR_BRAK, 7, 12, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_MISSILE_ATTACK6, 0},  // Aim
-	{"S_CYBRAKDEMON_MISSILE_ATTACK6", 0, SPR_BRAK, 26 + FF_FULLBRIGHT, 12, {A_BrakFireShot}, MT_CYBRAKDEMON_MISSILE, 128, S_CYBRAKDEMON_FINISH_ATTACK1, 0},  // Fire
-	{"S_CYBRAKDEMON_FLAME_ATTACK1", 0, SPR_BRAK, 7, 1, {A_Repeat}, 1, S_CYBRAKDEMON_FLAME_ATTACK1, S_CYBRAKDEMON_FLAME_ATTACK2, 0},  // Reset
-	{"S_CYBRAKDEMON_FLAME_ATTACK2", 0, SPR_BRAK, 7, 6, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_FLAME_ATTACK3, 0},  // Aim
-	{"S_CYBRAKDEMON_FLAME_ATTACK3", 0, SPR_BRAK, 26 + FF_FULLBRIGHT, 2, {A_BrakFireShot}, MT_CYBRAKDEMON_FLAMESHOT, 128, S_CYBRAKDEMON_FLAME_ATTACK4, 0},  // Fire
-	{"S_CYBRAKDEMON_FLAME_ATTACK4", 0, SPR_BRAK, 7, 1, {A_Repeat}, 30, S_CYBRAKDEMON_FLAME_ATTACK3, S_CYBRAKDEMON_FINISH_ATTACK1, 0},  // Loop
-	{"S_CYBRAKDEMON_CHOOSE_ATTACK2", 0, SPR_BRAK, 0, 6, {A_RandomState}, S_CYBRAKDEMON_VILE_ATTACK1, S_CYBRAKDEMON_NAPALM_ATTACK1, S_CYBRAKDEMON_MISSILE_ATTACK1, 0},
-	{"S_CYBRAKDEMON_VILE_ATTACK1", 0, SPR_BRAK, 20, 0, {A_LinedefExecuteFromArg}, 5, 0, S_CYBRAKDEMON_VILE_ATTACK2, 0},
-	{"S_CYBRAKDEMON_VILE_ATTACK2", 0, SPR_BRAK, 20, 24, {A_VileTarget}, MT_CYBRAKDEMON_TARGET_RETICULE, 1, S_CYBRAKDEMON_VILE_ATTACK3, 0},
-	{"S_CYBRAKDEMON_VILE_ATTACK3", 0, SPR_BRAK, 19, 8, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_VILE_ATTACK4, 0},
-	{"S_CYBRAKDEMON_VILE_ATTACK4", 0, SPR_BRAK, 18, 8, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_VILE_ATTACK5, 0},
-	{"S_CYBRAKDEMON_VILE_ATTACK5", 0, SPR_BRAK, 8, 32, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_VILE_ATTACK6, 0},
-	{"S_CYBRAKDEMON_VILE_ATTACK6", 0, SPR_BRAK, 20 + FF_FULLBRIGHT, 28, {A_VileAttack}, sfx_brakrx, MT_CYBRAKDEMON_VILE_EXPLOSION + (1<<16), S_CYBRAKDEMON_FINISH_ATTACK1, 0},
-	{"S_CYBRAKDEMON_NAPALM_ATTACK1", 0, SPR_BRAK, 0, 6, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_NAPALM_ATTACK2, 0},
-	{"S_CYBRAKDEMON_NAPALM_ATTACK2", 0, SPR_BRAK, 21 + FF_FULLBRIGHT, 8, {A_BrakLobShot}, MT_CYBRAKDEMON_NAPALM_BOMB_LARGE, 96, S_CYBRAKDEMON_NAPALM_ATTACK3, 0},
-	{"S_CYBRAKDEMON_NAPALM_ATTACK3", 0, SPR_BRAK, 0, 8, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_FINISH_ATTACK1, 0},
-	{"S_CYBRAKDEMON_FINISH_ATTACK1", 0, SPR_BRAK, 0, 0, {A_SetObjectFlags2}, MF2_FRET, 1, S_CYBRAKDEMON_FINISH_ATTACK2, 0},  // If just attacked, remove MF2_FRET w/out going back to spawnstate
-	{"S_CYBRAKDEMON_FINISH_ATTACK2", 0, SPR_BRAK, 0, 0, {A_SetReactionTime}, 0, 0, S_CYBRAKDEMON_WALK1, 0},  // If just attacked, remove MF2_FRET w/out going back to spawnstate
-	{"S_CYBRAKDEMON_PAIN1", 0, SPR_BRAK, 18, 24, {A_Pain}, 0, 0, S_CYBRAKDEMON_PAIN2, 0},
-	{"S_CYBRAKDEMON_PAIN2", 0, SPR_BRAK, 18, 0, {A_CheckHealth}, 3, S_CYBRAKDEMON_PAIN3, S_CYBRAKDEMON_CHOOSE_ATTACK1, 0},
-	{"S_CYBRAKDEMON_PAIN3", 0, SPR_BRAK, 18, 0, {A_LinedefExecuteFromArg}, 4, 0, S_CYBRAKDEMON_CHOOSE_ATTACK1, 0},
-	{"S_CYBRAKDEMON_DIE1", 0, SPR_BRAK, 18, 1, {A_Repeat}, 1, S_CYBRAKDEMON_DIE1, S_CYBRAKDEMON_DIE2, 0},
-	{"S_CYBRAKDEMON_DIE2", 0, SPR_BRAK, 18, 2, {A_BossScream}, 2, 0, S_CYBRAKDEMON_DIE3, 0},
-	{"S_CYBRAKDEMON_DIE3", 0, SPR_BRAK, 18, 0, {A_Repeat}, 52, S_CYBRAKDEMON_DIE2, S_CYBRAKDEMON_DIE4, 0},
-	{"S_CYBRAKDEMON_DIE4", 0, SPR_BRAK, 13, 34, {A_BossDeath}, 0, 0, S_CYBRAKDEMON_DIE5, 0},
-	{"S_CYBRAKDEMON_DIE5", 0, SPR_BRAK, 14, 34, {NULL}, 0, 0, S_CYBRAKDEMON_DIE6, 0},
-	{"S_CYBRAKDEMON_DIE6", 0, SPR_BRAK, 15, 34, {NULL}, 0, 0, S_CYBRAKDEMON_DIE7, 0},
-	{"S_CYBRAKDEMON_DIE7", 0, SPR_BRAK, 16, 34, {NULL}, 0, 0, S_CYBRAKDEMON_DIE8, 0},
-	{"S_CYBRAKDEMON_DIE8", 0, SPR_BRAK, 17, 34, {NULL}, sfx_befall, 0, S_CYBRAKDEMON_DIE8, 0},
-	{"S_CYBRAKDEMON_DEINVINCIBLERIZE", 0, SPR_BRAK, 0, 0, {A_SetObjectFlags}, MF_SPECIAL|MF_SHOOTABLE, 2, S_CYBRAKDEMON_IDLE, 0},
-	{"S_CYBRAKDEMON_INVINCIBLERIZE", 0, SPR_BRAK, 0, 0, {A_SetObjectFlags}, MF_SPECIAL|MF_SHOOTABLE, 1, S_CYBRAKDEMON_IDLE, 0},
-
-	{"S_CYBRAKDEMONMISSILE", 0, SPR_RCKT, 0 + FF_FULLBRIGHT, 1, {A_SetObjectFlags2}, MF2_RAILRING, 2, S_CYBRAKDEMONMISSILE, 0},
-	{"S_CYBRAKDEMONMISSILE_EXPLODE1", 0, SPR_RCKT, 1 + FF_FULLBRIGHT, 8, {A_Explode}, 0, 0, S_CYBRAKDEMONMISSILE_EXPLODE2, 0},  //TODO: set missile mobj's "damage" to an appropriate radius
-	{"S_CYBRAKDEMONMISSILE_EXPLODE2", 0, SPR_RCKT, 2 + FF_FULLBRIGHT, 6, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_FLAMES + (6<<16), 32 + (16<<16), S_CYBRAKDEMONMISSILE_EXPLODE3, 0},
-	{"S_CYBRAKDEMONMISSILE_EXPLODE3", 0, SPR_RCKT, 3 + FF_FULLBRIGHT, 4, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_CYBRAKDEMONFLAMESHOT_FLY1", 0, SPR_FLME, FF_FULLBRIGHT  , 15, {NULL}, 0, 0, S_CYBRAKDEMONFLAMESHOT_FLY2, 0},
-	{"S_CYBRAKDEMONFLAMESHOT_FLY2", 0, SPR_FLME, FF_FULLBRIGHT|1, 15, {NULL}, 0, 0, S_CYBRAKDEMONFLAMESHOT_FLY3, 0},
-	{"S_CYBRAKDEMONFLAMESHOT_FLY3", 0, SPR_FLME, FF_FULLBRIGHT|2, -1, {NULL}, 0, 0, S_CYBRAKDEMONFLAMESHOT_FLY3, 0},
-	{"S_CYBRAKDEMONFLAMESHOT_DIE", 0, SPR_FLME, FF_FULLBRIGHT|2, 0, {A_SpawnObjectRelative}, 0, MT_CYBRAKDEMON_FLAMEREST, S_NULL, 0},
-
-	{"S_CYBRAKDEMONFLAMEREST", 0, SPR_FLAM, FF_FULLBRIGHT, 1, {A_SetFuse}, 10*TICRATE, 0, S_FLAMEREST, 0},
-
-	{"S_CYBRAKDEMONELECTRICBARRIER_INIT1", 0, SPR_ELEC, 0 + FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_INIT2, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_INIT2", 0, SPR_ELEC, 0 + FF_FULLBRIGHT, 0, {A_RemoteAction}, -1, S_CYBRAKDEMON_INVINCIBLERIZE, S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND", 0, SPR_ELEC, 0 + FF_FULLBRIGHT, 0, {A_PlayActiveSound}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER1, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER1", 0, SPR_ELEC, 0 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER2, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER2", 0, SPR_ELEC, 0 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER3, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER3", 0, SPR_ELEC, 1 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER4, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER4", 0, SPR_ELEC, 1 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER5, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER5", 0, SPR_ELEC, 2 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER6, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER6", 0, SPR_ELEC, 2 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER7, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER7", 0, SPR_ELEC, 3 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER8, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER8", 0, SPR_ELEC, 3 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER9, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER9", 0, SPR_ELEC, 4 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER10, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER10", 0, SPR_ELEC, 4 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER11, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER11", 0, SPR_ELEC, 5 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER12, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER12", 0, SPR_ELEC, 5 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER13, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER13", 0, SPR_ELEC, 6 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER14, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER14", 0, SPR_ELEC, 6 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER15, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER15", 0, SPR_ELEC, 7 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER16, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER16", 0, SPR_ELEC, 7 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER17, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER17", 0, SPR_ELEC, 8 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER18, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER18", 0, SPR_ELEC, 8 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER19, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER19", 0, SPR_ELEC, 9 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER20, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER20", 0, SPR_ELEC, 9 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER21, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER21", 0, SPR_ELEC, 10 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER22, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER22", 0, SPR_ELEC, 10 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER23, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER23", 0, SPR_ELEC, 11 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER24, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER24", 0, SPR_ELEC, 11 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_DIE1", 0, SPR_NULL, 0, 0, {A_RemoteAction}, -1, S_CYBRAKDEMON_DEINVINCIBLERIZE, S_CYBRAKDEMONELECTRICBARRIER_DIE2, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_DIE2", 0, SPR_NULL, 0, 0, {A_SetObjectFlags}, MF_PUSHABLE|MF_FIRE|MF_PAIN, 1, S_CYBRAKDEMONELECTRICBARRIER_DIE3, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_DIE3", 0, SPR_NULL, 0, 20*TICRATE, {A_Scream}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHECK", 0, SPR_NULL, 0, 0, {A_CheckRandom}, 10, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMFAIL, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS", 0, SPR_NULL, 0, 0, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHOOSE, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHOOSE", 0, SPR_NULL, 0, 0, {A_RandomStateRange}, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM12, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1", 0, SPR_ELEC, 0 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM2", 0, SPR_ELEC, 1 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM3", 0, SPR_ELEC, 2 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM4", 0, SPR_ELEC, 3 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM5", 0, SPR_ELEC, 4 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM6", 0, SPR_ELEC, 5 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM7", 0, SPR_ELEC, 6 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM8", 0, SPR_ELEC, 7 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM9", 0, SPR_ELEC, 8 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM10", 0, SPR_ELEC, 9 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM11", 0, SPR_ELEC, 10 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM12", 0, SPR_ELEC, 11 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMFAIL", 0, SPR_NULL, 0, 1, {NULL}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP", 0, SPR_NULL, 0, 0, {A_Repeat}, 5*TICRATE, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHECK, S_CYBRAKDEMONELECTRICBARRIER_REVIVE1, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_REVIVE1", 0, SPR_NULL, 0, 0, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_REVIVE2, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_REVIVE2", 0, SPR_NULL, 0, 0, {A_SpawnFreshCopy}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_REVIVE3, 0},
-	{"S_CYBRAKDEMONELECTRICBARRIER_REVIVE3", 0, SPR_NULL, 0, TICRATE, {A_PlaySound}, sfx_s3k79, 0, S_NULL, 0},
-
-	{"S_CYBRAKDEMONTARGETRETICULE1", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT  , 1, {A_VileFire}, sfx_s3k9d, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE2, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE2", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE3, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE3", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|1, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE4, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE4", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE5, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE5", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|2, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE6, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE6", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE7, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE7", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|3, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE8, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE8", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE9, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE9", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|4, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE10, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE10", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE11, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE11", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|5, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE12, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE12", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE13, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE13", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT  , 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE14, 0},
-	{"S_CYBRAKDEMONTARGETRETICULE14", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_Repeat}, 6, S_CYBRAKDEMONTARGETRETICULE2, S_NULL, 0},
-
-	{"S_CYBRAKDEMONTARGETDOT", 0, SPR_HOOP, FF_TRANS50|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_CYBRAKDEMONNAPALMBOMBLARGE_FLY1", 0, SPR_NPLM, 0, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY2, 0},
-	{"S_CYBRAKDEMONNAPALMBOMBLARGE_FLY2", 0, SPR_NPLM, 1, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY3, 0},
-	{"S_CYBRAKDEMONNAPALMBOMBLARGE_FLY3", 0, SPR_NPLM, 2, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY4, 0},
-	{"S_CYBRAKDEMONNAPALMBOMBLARGE_FLY4", 0, SPR_NPLM, 3, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY1, 0},
-	{"S_CYBRAKDEMONNAPALMBOMBLARGE_DIE1", 0, SPR_NPLM, 0, 1, {A_Explode}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_DIE2, 0}, // Explode
-	{"S_CYBRAKDEMONNAPALMBOMBLARGE_DIE2", 0, SPR_NPLM, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_BOMB_SMALL + (6<<16), 256 + (48<<16), S_CYBRAKDEMONNAPALMBOMBLARGE_DIE3, 0}, // Outer ring
-	{"S_CYBRAKDEMONNAPALMBOMBLARGE_DIE3", 0, SPR_NPLM, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_BOMB_SMALL + (1<<16), 32<<16, S_CYBRAKDEMONNAPALMBOMBLARGE_DIE4, 0}, // Center
-	{"S_CYBRAKDEMONNAPALMBOMBLARGE_DIE4", 0, SPR_NULL, 0, 81, {A_Scream}, 0, 0, S_NULL, 0}, // Sound
-
-	{"S_CYBRAKDEMONNAPALMBOMBSMALL", 0, SPR_MNPL, 0, 1, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBSMALL, 0},
-	{"S_CYBRAKDEMONNAPALMBOMBSMALL_DIE1", 0, SPR_MNPL, 0, 1, {A_Explode}, 0, 0, S_CYBRAKDEMONNAPALMBOMBSMALL_DIE2, 0}, // Explode
-	{"S_CYBRAKDEMONNAPALMBOMBSMALL_DIE2", 0, SPR_MNPL, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_FLAMES + (12<<16), 128 + (40<<16), S_CYBRAKDEMONNAPALMBOMBSMALL_DIE3, 0}, // Outer ring
-	{"S_CYBRAKDEMONNAPALMBOMBSMALL_DIE3", 0, SPR_MNPL, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_FLAMES + (8<<16), 64 + (32<<16), S_CYBRAKDEMONNAPALMBOMBSMALL_DIE4, 0}, // Inner ring
-	{"S_CYBRAKDEMONNAPALMBOMBSMALL_DIE4", 0, SPR_MNPL, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_FLAMES + (1<<16), 24<<16, S_CYBRAKDEMONNAPALMBOMBSMALL_DIE5, 0}, // Center
-	{"S_CYBRAKDEMONNAPALMBOMBSMALL_DIE5", 0, SPR_NULL, 0, 24, {A_Scream}, 0, 0, S_NULL, 0}, // Sound
-
-	{"S_CYBRAKDEMONNAPALMFLAME_FLY1", 0, SPR_SFLM, FF_FULLBRIGHT,   2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY2, 0},
-	{"S_CYBRAKDEMONNAPALMFLAME_FLY2", 0, SPR_SFLM, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY3, 0},
-	{"S_CYBRAKDEMONNAPALMFLAME_FLY3", 0, SPR_SFLM, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY4, 0},
-	{"S_CYBRAKDEMONNAPALMFLAME_FLY4", 0, SPR_SFLM, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY5, 0},
-	{"S_CYBRAKDEMONNAPALMFLAME_FLY5", 0, SPR_SFLM, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY6, 0},
-	{"S_CYBRAKDEMONNAPALMFLAME_FLY6", 0, SPR_SFLM, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY1, 0},
-	{"S_CYBRAKDEMONNAPALMFLAME_DIE", 0, SPR_SFLM, FF_FULLBRIGHT,   0, {A_SpawnObjectRelative}, 0, MT_CYBRAKDEMON_FLAMEREST, S_NULL, 0},
-
-	{"S_CYBRAKDEMONVILEEXPLOSION1", 0, SPR_NULL, 0, 1, {A_SetFuse}, TICRATE, 0, S_CYBRAKDEMONVILEEXPLOSION2, 0},
-	{"S_CYBRAKDEMONVILEEXPLOSION2", 0, SPR_NULL, 0, 0, {A_ScoreRise}, 0, 0, S_CYBRAKDEMONVILEEXPLOSION3, 0},
-	{"S_CYBRAKDEMONVILEEXPLOSION3", 0, SPR_NULL, 0, 1, {A_BossScream}, 0, 0, S_CYBRAKDEMONVILEEXPLOSION1, 0},
+	{"CYBRAKDEMON_IDLE", 0, SPR_BRAK, 0, 10, {A_Look}, 0, 0, S_CYBRAKDEMON_IDLE, 0},
+	{"CYBRAKDEMON_WALK1", 0, SPR_BRAK, 1, 8, {A_BrakChase}, 3, 0, S_CYBRAKDEMON_WALK2, 0},
+	{"CYBRAKDEMON_WALK2", 0, SPR_BRAK, 2, 8, {A_BrakChase}, 3, 0, S_CYBRAKDEMON_WALK3, 0},
+	{"CYBRAKDEMON_WALK3", 0, SPR_BRAK, 3, 8, {A_BrakChase}, 3, sfx_bestep, S_CYBRAKDEMON_WALK4, 0},
+	{"CYBRAKDEMON_WALK4", 0, SPR_BRAK, 4, 8, {A_BrakChase}, 3, 0, S_CYBRAKDEMON_WALK5, 0},
+	{"CYBRAKDEMON_WALK5", 0, SPR_BRAK, 5, 8, {A_BrakChase}, 3, 0, S_CYBRAKDEMON_WALK6, 0},
+	{"CYBRAKDEMON_WALK6", 0, SPR_BRAK, 6, 8, {A_BrakChase}, 3, sfx_bestp2, S_CYBRAKDEMON_WALK1, 0},
+	{"CYBRAKDEMON_CHOOSE_ATTACK1", 0, SPR_BRAK, 7, 6, {A_RandomState}, S_CYBRAKDEMON_MISSILE_ATTACK1, S_CYBRAKDEMON_FLAME_ATTACK1, S_CYBRAKDEMON_MISSILE_ATTACK1, 0},
+	{"CYBRAKDEMON_MISSILE_ATTACK1", 0, SPR_BRAK, 7, 6, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_MISSILE_ATTACK2, 0},  // Aim
+	{"CYBRAKDEMON_MISSILE_ATTACK2", 0, SPR_BRAK, 26 + FF_FULLBRIGHT, 12, {A_BrakFireShot}, MT_CYBRAKDEMON_MISSILE, 128, S_CYBRAKDEMON_MISSILE_ATTACK3, 0},  // Fire
+	{"CYBRAKDEMON_MISSILE_ATTACK3", 0, SPR_BRAK, 7, 12, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_MISSILE_ATTACK4, 0},  // Aim
+	{"CYBRAKDEMON_MISSILE_ATTACK4", 0, SPR_BRAK, 26 + FF_FULLBRIGHT, 12, {A_BrakFireShot}, MT_CYBRAKDEMON_MISSILE, 128, S_CYBRAKDEMON_MISSILE_ATTACK5, 0},  // Fire
+	{"CYBRAKDEMON_MISSILE_ATTACK5", 0, SPR_BRAK, 7, 12, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_MISSILE_ATTACK6, 0},  // Aim
+	{"CYBRAKDEMON_MISSILE_ATTACK6", 0, SPR_BRAK, 26 + FF_FULLBRIGHT, 12, {A_BrakFireShot}, MT_CYBRAKDEMON_MISSILE, 128, S_CYBRAKDEMON_FINISH_ATTACK1, 0},  // Fire
+	{"CYBRAKDEMON_FLAME_ATTACK1", 0, SPR_BRAK, 7, 1, {A_Repeat}, 1, S_CYBRAKDEMON_FLAME_ATTACK1, S_CYBRAKDEMON_FLAME_ATTACK2, 0},  // Reset
+	{"CYBRAKDEMON_FLAME_ATTACK2", 0, SPR_BRAK, 7, 6, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_FLAME_ATTACK3, 0},  // Aim
+	{"CYBRAKDEMON_FLAME_ATTACK3", 0, SPR_BRAK, 26 + FF_FULLBRIGHT, 2, {A_BrakFireShot}, MT_CYBRAKDEMON_FLAMESHOT, 128, S_CYBRAKDEMON_FLAME_ATTACK4, 0},  // Fire
+	{"CYBRAKDEMON_FLAME_ATTACK4", 0, SPR_BRAK, 7, 1, {A_Repeat}, 30, S_CYBRAKDEMON_FLAME_ATTACK3, S_CYBRAKDEMON_FINISH_ATTACK1, 0},  // Loop
+	{"CYBRAKDEMON_CHOOSE_ATTACK2", 0, SPR_BRAK, 0, 6, {A_RandomState}, S_CYBRAKDEMON_VILE_ATTACK1, S_CYBRAKDEMON_NAPALM_ATTACK1, S_CYBRAKDEMON_MISSILE_ATTACK1, 0},
+	{"CYBRAKDEMON_VILE_ATTACK1", 0, SPR_BRAK, 20, 0, {A_LinedefExecuteFromArg}, 5, 0, S_CYBRAKDEMON_VILE_ATTACK2, 0},
+	{"CYBRAKDEMON_VILE_ATTACK2", 0, SPR_BRAK, 20, 24, {A_VileTarget}, MT_CYBRAKDEMON_TARGET_RETICULE, 1, S_CYBRAKDEMON_VILE_ATTACK3, 0},
+	{"CYBRAKDEMON_VILE_ATTACK3", 0, SPR_BRAK, 19, 8, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_VILE_ATTACK4, 0},
+	{"CYBRAKDEMON_VILE_ATTACK4", 0, SPR_BRAK, 18, 8, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_VILE_ATTACK5, 0},
+	{"CYBRAKDEMON_VILE_ATTACK5", 0, SPR_BRAK, 8, 32, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_VILE_ATTACK6, 0},
+	{"CYBRAKDEMON_VILE_ATTACK6", 0, SPR_BRAK, 20 + FF_FULLBRIGHT, 28, {A_VileAttack}, sfx_brakrx, MT_CYBRAKDEMON_VILE_EXPLOSION + (1<<16), S_CYBRAKDEMON_FINISH_ATTACK1, 0},
+	{"CYBRAKDEMON_NAPALM_ATTACK1", 0, SPR_BRAK, 0, 6, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_NAPALM_ATTACK2, 0},
+	{"CYBRAKDEMON_NAPALM_ATTACK2", 0, SPR_BRAK, 21 + FF_FULLBRIGHT, 8, {A_BrakLobShot}, MT_CYBRAKDEMON_NAPALM_BOMB_LARGE, 96, S_CYBRAKDEMON_NAPALM_ATTACK3, 0},
+	{"CYBRAKDEMON_NAPALM_ATTACK3", 0, SPR_BRAK, 0, 8, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_FINISH_ATTACK1, 0},
+	{"CYBRAKDEMON_FINISH_ATTACK1", 0, SPR_BRAK, 0, 0, {A_SetObjectFlags2}, MF2_FRET, 1, S_CYBRAKDEMON_FINISH_ATTACK2, 0},  // If just attacked, remove MF2_FRET w/out going back to spawnstate
+	{"CYBRAKDEMON_FINISH_ATTACK2", 0, SPR_BRAK, 0, 0, {A_SetReactionTime}, 0, 0, S_CYBRAKDEMON_WALK1, 0},  // If just attacked, remove MF2_FRET w/out going back to spawnstate
+	{"CYBRAKDEMON_PAIN1", 0, SPR_BRAK, 18, 24, {A_Pain}, 0, 0, S_CYBRAKDEMON_PAIN2, 0},
+	{"CYBRAKDEMON_PAIN2", 0, SPR_BRAK, 18, 0, {A_CheckHealth}, 3, S_CYBRAKDEMON_PAIN3, S_CYBRAKDEMON_CHOOSE_ATTACK1, 0},
+	{"CYBRAKDEMON_PAIN3", 0, SPR_BRAK, 18, 0, {A_LinedefExecuteFromArg}, 4, 0, S_CYBRAKDEMON_CHOOSE_ATTACK1, 0},
+	{"CYBRAKDEMON_DIE1", 0, SPR_BRAK, 18, 1, {A_Repeat}, 1, S_CYBRAKDEMON_DIE1, S_CYBRAKDEMON_DIE2, 0},
+	{"CYBRAKDEMON_DIE2", 0, SPR_BRAK, 18, 2, {A_BossScream}, 2, 0, S_CYBRAKDEMON_DIE3, 0},
+	{"CYBRAKDEMON_DIE3", 0, SPR_BRAK, 18, 0, {A_Repeat}, 52, S_CYBRAKDEMON_DIE2, S_CYBRAKDEMON_DIE4, 0},
+	{"CYBRAKDEMON_DIE4", 0, SPR_BRAK, 13, 34, {A_BossDeath}, 0, 0, S_CYBRAKDEMON_DIE5, 0},
+	{"CYBRAKDEMON_DIE5", 0, SPR_BRAK, 14, 34, {NULL}, 0, 0, S_CYBRAKDEMON_DIE6, 0},
+	{"CYBRAKDEMON_DIE6", 0, SPR_BRAK, 15, 34, {NULL}, 0, 0, S_CYBRAKDEMON_DIE7, 0},
+	{"CYBRAKDEMON_DIE7", 0, SPR_BRAK, 16, 34, {NULL}, 0, 0, S_CYBRAKDEMON_DIE8, 0},
+	{"CYBRAKDEMON_DIE8", 0, SPR_BRAK, 17, 34, {NULL}, sfx_befall, 0, S_CYBRAKDEMON_DIE8, 0},
+	{"CYBRAKDEMON_DEINVINCIBLERIZE", 0, SPR_BRAK, 0, 0, {A_SetObjectFlags}, MF_SPECIAL|MF_SHOOTABLE, 2, S_CYBRAKDEMON_IDLE, 0},
+	{"CYBRAKDEMON_INVINCIBLERIZE", 0, SPR_BRAK, 0, 0, {A_SetObjectFlags}, MF_SPECIAL|MF_SHOOTABLE, 1, S_CYBRAKDEMON_IDLE, 0},
+
+	{"CYBRAKDEMONMISSILE", 0, SPR_RCKT, 0 + FF_FULLBRIGHT, 1, {A_SetObjectFlags2}, MF2_RAILRING, 2, S_CYBRAKDEMONMISSILE, 0},
+	{"CYBRAKDEMONMISSILE_EXPLODE1", 0, SPR_RCKT, 1 + FF_FULLBRIGHT, 8, {A_Explode}, 0, 0, S_CYBRAKDEMONMISSILE_EXPLODE2, 0},  //TODO: set missile mobj's "damage" to an appropriate radius
+	{"CYBRAKDEMONMISSILE_EXPLODE2", 0, SPR_RCKT, 2 + FF_FULLBRIGHT, 6, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_FLAMES + (6<<16), 32 + (16<<16), S_CYBRAKDEMONMISSILE_EXPLODE3, 0},
+	{"CYBRAKDEMONMISSILE_EXPLODE3", 0, SPR_RCKT, 3 + FF_FULLBRIGHT, 4, {NULL}, 0, 0, S_NULL, 0},
+
+	{"CYBRAKDEMONFLAMESHOT_FLY1", 0, SPR_FLME, FF_FULLBRIGHT  , 15, {NULL}, 0, 0, S_CYBRAKDEMONFLAMESHOT_FLY2, 0},
+	{"CYBRAKDEMONFLAMESHOT_FLY2", 0, SPR_FLME, FF_FULLBRIGHT|1, 15, {NULL}, 0, 0, S_CYBRAKDEMONFLAMESHOT_FLY3, 0},
+	{"CYBRAKDEMONFLAMESHOT_FLY3", 0, SPR_FLME, FF_FULLBRIGHT|2, -1, {NULL}, 0, 0, S_CYBRAKDEMONFLAMESHOT_FLY3, 0},
+	{"CYBRAKDEMONFLAMESHOT_DIE", 0, SPR_FLME, FF_FULLBRIGHT|2, 0, {A_SpawnObjectRelative}, 0, MT_CYBRAKDEMON_FLAMEREST, S_NULL, 0},
+
+	{"CYBRAKDEMONFLAMEREST", 0, SPR_FLAM, FF_FULLBRIGHT, 1, {A_SetFuse}, 10*TICRATE, 0, S_FLAMEREST, 0},
+
+	{"CYBRAKDEMONELECTRICBARRIER_INIT1", 0, SPR_ELEC, 0 + FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_INIT2, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_INIT2", 0, SPR_ELEC, 0 + FF_FULLBRIGHT, 0, {A_RemoteAction}, -1, S_CYBRAKDEMON_INVINCIBLERIZE, S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_PLAYSOUND", 0, SPR_ELEC, 0 + FF_FULLBRIGHT, 0, {A_PlayActiveSound}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER1, 0},
+	{"CYBRAKDEMONELECTRICBARRIER1", 0, SPR_ELEC, 0 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER2, 0},
+	{"CYBRAKDEMONELECTRICBARRIER2", 0, SPR_ELEC, 0 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER3, 0},
+	{"CYBRAKDEMONELECTRICBARRIER3", 0, SPR_ELEC, 1 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER4, 0},
+	{"CYBRAKDEMONELECTRICBARRIER4", 0, SPR_ELEC, 1 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER5, 0},
+	{"CYBRAKDEMONELECTRICBARRIER5", 0, SPR_ELEC, 2 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER6, 0},
+	{"CYBRAKDEMONELECTRICBARRIER6", 0, SPR_ELEC, 2 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER7, 0},
+	{"CYBRAKDEMONELECTRICBARRIER7", 0, SPR_ELEC, 3 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER8, 0},
+	{"CYBRAKDEMONELECTRICBARRIER8", 0, SPR_ELEC, 3 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER9, 0},
+	{"CYBRAKDEMONELECTRICBARRIER9", 0, SPR_ELEC, 4 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER10, 0},
+	{"CYBRAKDEMONELECTRICBARRIER10", 0, SPR_ELEC, 4 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER11, 0},
+	{"CYBRAKDEMONELECTRICBARRIER11", 0, SPR_ELEC, 5 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER12, 0},
+	{"CYBRAKDEMONELECTRICBARRIER12", 0, SPR_ELEC, 5 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER13, 0},
+	{"CYBRAKDEMONELECTRICBARRIER13", 0, SPR_ELEC, 6 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER14, 0},
+	{"CYBRAKDEMONELECTRICBARRIER14", 0, SPR_ELEC, 6 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER15, 0},
+	{"CYBRAKDEMONELECTRICBARRIER15", 0, SPR_ELEC, 7 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER16, 0},
+	{"CYBRAKDEMONELECTRICBARRIER16", 0, SPR_ELEC, 7 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER17, 0},
+	{"CYBRAKDEMONELECTRICBARRIER17", 0, SPR_ELEC, 8 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER18, 0},
+	{"CYBRAKDEMONELECTRICBARRIER18", 0, SPR_ELEC, 8 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER19, 0},
+	{"CYBRAKDEMONELECTRICBARRIER19", 0, SPR_ELEC, 9 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER20, 0},
+	{"CYBRAKDEMONELECTRICBARRIER20", 0, SPR_ELEC, 9 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER21, 0},
+	{"CYBRAKDEMONELECTRICBARRIER21", 0, SPR_ELEC, 10 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER22, 0},
+	{"CYBRAKDEMONELECTRICBARRIER22", 0, SPR_ELEC, 10 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER23, 0},
+	{"CYBRAKDEMONELECTRICBARRIER23", 0, SPR_ELEC, 11 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER24, 0},
+	{"CYBRAKDEMONELECTRICBARRIER24", 0, SPR_ELEC, 11 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_DIE1", 0, SPR_NULL, 0, 0, {A_RemoteAction}, -1, S_CYBRAKDEMON_DEINVINCIBLERIZE, S_CYBRAKDEMONELECTRICBARRIER_DIE2, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_DIE2", 0, SPR_NULL, 0, 0, {A_SetObjectFlags}, MF_PUSHABLE|MF_FIRE|MF_PAIN, 1, S_CYBRAKDEMONELECTRICBARRIER_DIE3, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_DIE3", 0, SPR_NULL, 0, 20*TICRATE, {A_Scream}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHECK", 0, SPR_NULL, 0, 0, {A_CheckRandom}, 10, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMFAIL, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS", 0, SPR_NULL, 0, 0, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHOOSE, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHOOSE", 0, SPR_NULL, 0, 0, {A_RandomStateRange}, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM12, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1", 0, SPR_ELEC, 0 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM2", 0, SPR_ELEC, 1 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM3", 0, SPR_ELEC, 2 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM4", 0, SPR_ELEC, 3 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM5", 0, SPR_ELEC, 4 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM6", 0, SPR_ELEC, 5 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM7", 0, SPR_ELEC, 6 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM8", 0, SPR_ELEC, 7 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM9", 0, SPR_ELEC, 8 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM10", 0, SPR_ELEC, 9 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM11", 0, SPR_ELEC, 10 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM12", 0, SPR_ELEC, 11 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMFAIL", 0, SPR_NULL, 0, 1, {NULL}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP", 0, SPR_NULL, 0, 0, {A_Repeat}, 5*TICRATE, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHECK, S_CYBRAKDEMONELECTRICBARRIER_REVIVE1, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_REVIVE1", 0, SPR_NULL, 0, 0, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_REVIVE2, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_REVIVE2", 0, SPR_NULL, 0, 0, {A_SpawnFreshCopy}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_REVIVE3, 0},
+	{"CYBRAKDEMONELECTRICBARRIER_REVIVE3", 0, SPR_NULL, 0, TICRATE, {A_PlaySound}, sfx_s3k79, 0, S_NULL, 0},
+
+	{"CYBRAKDEMONTARGETRETICULE1", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT  , 1, {A_VileFire}, sfx_s3k9d, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE2, 0},
+	{"CYBRAKDEMONTARGETRETICULE2", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE3, 0},
+	{"CYBRAKDEMONTARGETRETICULE3", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|1, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE4, 0},
+	{"CYBRAKDEMONTARGETRETICULE4", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE5, 0},
+	{"CYBRAKDEMONTARGETRETICULE5", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|2, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE6, 0},
+	{"CYBRAKDEMONTARGETRETICULE6", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE7, 0},
+	{"CYBRAKDEMONTARGETRETICULE7", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|3, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE8, 0},
+	{"CYBRAKDEMONTARGETRETICULE8", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE9, 0},
+	{"CYBRAKDEMONTARGETRETICULE9", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|4, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE10, 0},
+	{"CYBRAKDEMONTARGETRETICULE10", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE11, 0},
+	{"CYBRAKDEMONTARGETRETICULE11", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|5, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE12, 0},
+	{"CYBRAKDEMONTARGETRETICULE12", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE13, 0},
+	{"CYBRAKDEMONTARGETRETICULE13", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT  , 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE14, 0},
+	{"CYBRAKDEMONTARGETRETICULE14", 0, SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_Repeat}, 6, S_CYBRAKDEMONTARGETRETICULE2, S_NULL, 0},
+
+	{"CYBRAKDEMONTARGETDOT", 0, SPR_HOOP, FF_TRANS50|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
+
+	{"CYBRAKDEMONNAPALMBOMBLARGE_FLY1", 0, SPR_NPLM, 0, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY2, 0},
+	{"CYBRAKDEMONNAPALMBOMBLARGE_FLY2", 0, SPR_NPLM, 1, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY3, 0},
+	{"CYBRAKDEMONNAPALMBOMBLARGE_FLY3", 0, SPR_NPLM, 2, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY4, 0},
+	{"CYBRAKDEMONNAPALMBOMBLARGE_FLY4", 0, SPR_NPLM, 3, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY1, 0},
+	{"CYBRAKDEMONNAPALMBOMBLARGE_DIE1", 0, SPR_NPLM, 0, 1, {A_Explode}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_DIE2, 0}, // Explode
+	{"CYBRAKDEMONNAPALMBOMBLARGE_DIE2", 0, SPR_NPLM, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_BOMB_SMALL + (6<<16), 256 + (48<<16), S_CYBRAKDEMONNAPALMBOMBLARGE_DIE3, 0}, // Outer ring
+	{"CYBRAKDEMONNAPALMBOMBLARGE_DIE3", 0, SPR_NPLM, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_BOMB_SMALL + (1<<16), 32<<16, S_CYBRAKDEMONNAPALMBOMBLARGE_DIE4, 0}, // Center
+	{"CYBRAKDEMONNAPALMBOMBLARGE_DIE4", 0, SPR_NULL, 0, 81, {A_Scream}, 0, 0, S_NULL, 0}, // Sound
+
+	{"CYBRAKDEMONNAPALMBOMBSMALL", 0, SPR_MNPL, 0, 1, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBSMALL, 0},
+	{"CYBRAKDEMONNAPALMBOMBSMALL_DIE1", 0, SPR_MNPL, 0, 1, {A_Explode}, 0, 0, S_CYBRAKDEMONNAPALMBOMBSMALL_DIE2, 0}, // Explode
+	{"CYBRAKDEMONNAPALMBOMBSMALL_DIE2", 0, SPR_MNPL, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_FLAMES + (12<<16), 128 + (40<<16), S_CYBRAKDEMONNAPALMBOMBSMALL_DIE3, 0}, // Outer ring
+	{"CYBRAKDEMONNAPALMBOMBSMALL_DIE3", 0, SPR_MNPL, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_FLAMES + (8<<16), 64 + (32<<16), S_CYBRAKDEMONNAPALMBOMBSMALL_DIE4, 0}, // Inner ring
+	{"CYBRAKDEMONNAPALMBOMBSMALL_DIE4", 0, SPR_MNPL, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_FLAMES + (1<<16), 24<<16, S_CYBRAKDEMONNAPALMBOMBSMALL_DIE5, 0}, // Center
+	{"CYBRAKDEMONNAPALMBOMBSMALL_DIE5", 0, SPR_NULL, 0, 24, {A_Scream}, 0, 0, S_NULL, 0}, // Sound
+
+	{"CYBRAKDEMONNAPALMFLAME_FLY1", 0, SPR_SFLM, FF_FULLBRIGHT,   2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY2, 0},
+	{"CYBRAKDEMONNAPALMFLAME_FLY2", 0, SPR_SFLM, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY3, 0},
+	{"CYBRAKDEMONNAPALMFLAME_FLY3", 0, SPR_SFLM, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY4, 0},
+	{"CYBRAKDEMONNAPALMFLAME_FLY4", 0, SPR_SFLM, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY5, 0},
+	{"CYBRAKDEMONNAPALMFLAME_FLY5", 0, SPR_SFLM, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY6, 0},
+	{"CYBRAKDEMONNAPALMFLAME_FLY6", 0, SPR_SFLM, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY1, 0},
+	{"CYBRAKDEMONNAPALMFLAME_DIE", 0, SPR_SFLM, FF_FULLBRIGHT,   0, {A_SpawnObjectRelative}, 0, MT_CYBRAKDEMON_FLAMEREST, S_NULL, 0},
+
+	{"CYBRAKDEMONVILEEXPLOSION1", 0, SPR_NULL, 0, 1, {A_SetFuse}, TICRATE, 0, S_CYBRAKDEMONVILEEXPLOSION2, 0},
+	{"CYBRAKDEMONVILEEXPLOSION2", 0, SPR_NULL, 0, 0, {A_ScoreRise}, 0, 0, S_CYBRAKDEMONVILEEXPLOSION3, 0},
+	{"CYBRAKDEMONVILEEXPLOSION3", 0, SPR_NULL, 0, 1, {A_BossScream}, 0, 0, S_CYBRAKDEMONVILEEXPLOSION1, 0},
 
 	// Metal Sonic
-	{"S_METALSONIC_RACE", 0, SPR_PLAY, SPR2_STND, -1, {NULL}, 0, 0, S_METALSONIC_RACE, 0},
-
-	{"S_METALSONIC_FLOAT", 0, SPR_METL,  4, -1, {NULL},         0, 0, S_METALSONIC_FLOAT, 0},
-	{"S_METALSONIC_VECTOR", 0, SPR_METL, 16|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_METALSONIC_STUN, 0},
-	{"S_METALSONIC_STUN", 0, SPR_METL, 15, -1, {NULL},         0, 0, S_METALSONIC_FLOAT, 0},
-	{"S_METALSONIC_RAISE", 0, SPR_METL, 17, 20, {NULL},         0, 0, S_METALSONIC_GATHER, 0},
-	{"S_METALSONIC_GATHER", 0, SPR_METL, 18, -1, {NULL},         0, 0, S_METALSONIC_FLOAT, 0},
-	{"S_METALSONIC_DASH", 0, SPR_METL,  6|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 1, 2, S_METALSONIC_BOUNCE, 0},
-	{"S_METALSONIC_BOUNCE", 0, SPR_METL, 18|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 1, 2, S_METALSONIC_FLOAT, 0},
-	{"S_METALSONIC_BADBOUNCE", 0, SPR_METL, 14, -1, {NULL},         0, 0, S_METALSONIC_FLOAT, 0},
-	{"S_METALSONIC_SHOOT", 0, SPR_METL, 17, -1, {NULL},         0, 0, S_METALSONIC_GATHER, 0},
-	{"S_METALSONIC_PAIN", 0, SPR_METL, 15, 40, {A_Pain},       0, 0, S_METALSONIC_FLOAT, 0},
-	{"S_METALSONIC_DEATH1", 0, SPR_METL, 17,  2, {A_Fall},       0, 0, S_METALSONIC_DEATH2, 0},
-	{"S_METALSONIC_DEATH2", 0, SPR_METL, 17,  4, {A_BossScream}, 0, 0, S_METALSONIC_DEATH3, 0},
-	{"S_METALSONIC_DEATH3", 0, SPR_METL, 17,  0, {A_Repeat}, 17, S_METALSONIC_DEATH2, S_METALSONIC_DEATH4, 0},
-	{"S_METALSONIC_DEATH4", 0, SPR_METL, 17, -1, {A_BossDeath},  0, 0, S_NULL, 0},
-	{"S_METALSONIC_FLEE1", 0, SPR_METL, 15,  1, {A_BossScream},         0, 0, S_METALSONIC_FLEE2, 0},
-	{"S_METALSONIC_FLEE2", 0, SPR_METL, 15,  7, {NULL},                 0, 0, S_METALSONIC_FLEE1, 0},
-
-	{"S_MSSHIELD_F1", 0, SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30|FF_ANIMATE, -1, {NULL}, 11, 1, S_NULL, 0},
-	{"S_MSSHIELD_F2", 0, SPR_MSCF, FF_FULLBRIGHT|FF_ANIMATE|12, -1, {NULL}, 8, 2, S_NULL, 0},
+	{"METALSONIC_RACE", 0, SPR_PLAY, SPR2_STND, -1, {NULL}, 0, 0, S_METALSONIC_RACE, 0},
+
+	{"METALSONIC_FLOAT", 0, SPR_METL,  4, -1, {NULL},         0, 0, S_METALSONIC_FLOAT, 0},
+	{"METALSONIC_VECTOR", 0, SPR_METL, 16|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_METALSONIC_STUN, 0},
+	{"METALSONIC_STUN", 0, SPR_METL, 15, -1, {NULL},         0, 0, S_METALSONIC_FLOAT, 0},
+	{"METALSONIC_RAISE", 0, SPR_METL, 17, 20, {NULL},         0, 0, S_METALSONIC_GATHER, 0},
+	{"METALSONIC_GATHER", 0, SPR_METL, 18, -1, {NULL},         0, 0, S_METALSONIC_FLOAT, 0},
+	{"METALSONIC_DASH", 0, SPR_METL,  6|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 1, 2, S_METALSONIC_BOUNCE, 0},
+	{"METALSONIC_BOUNCE", 0, SPR_METL, 18|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 1, 2, S_METALSONIC_FLOAT, 0},
+	{"METALSONIC_BADBOUNCE", 0, SPR_METL, 14, -1, {NULL},         0, 0, S_METALSONIC_FLOAT, 0},
+	{"METALSONIC_SHOOT", 0, SPR_METL, 17, -1, {NULL},         0, 0, S_METALSONIC_GATHER, 0},
+	{"METALSONIC_PAIN", 0, SPR_METL, 15, 40, {A_Pain},       0, 0, S_METALSONIC_FLOAT, 0},
+	{"METALSONIC_DEATH1", 0, SPR_METL, 17,  2, {A_Fall},       0, 0, S_METALSONIC_DEATH2, 0},
+	{"METALSONIC_DEATH2", 0, SPR_METL, 17,  4, {A_BossScream}, 0, 0, S_METALSONIC_DEATH3, 0},
+	{"METALSONIC_DEATH3", 0, SPR_METL, 17,  0, {A_Repeat}, 17, S_METALSONIC_DEATH2, S_METALSONIC_DEATH4, 0},
+	{"METALSONIC_DEATH4", 0, SPR_METL, 17, -1, {A_BossDeath},  0, 0, S_NULL, 0},
+	{"METALSONIC_FLEE1", 0, SPR_METL, 15,  1, {A_BossScream},         0, 0, S_METALSONIC_FLEE2, 0},
+	{"METALSONIC_FLEE2", 0, SPR_METL, 15,  7, {NULL},                 0, 0, S_METALSONIC_FLEE1, 0},
+
+	{"MSSHIELD_F1", 0, SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30|FF_ANIMATE, -1, {NULL}, 11, 1, S_NULL, 0},
+	{"MSSHIELD_F2", 0, SPR_MSCF, FF_FULLBRIGHT|FF_ANIMATE|12, -1, {NULL}, 8, 2, S_NULL, 0},
 
 	// Ring
-	{"S_RING", 0, SPR_RING, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 23, 1, S_RING, 0},
+	{"RING", 0, SPR_RING, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 23, 1, S_RING, 0},
 
 	// Blue Sphere for special stages
-	{"S_BLUESPHERE", 0, SPR_SPHR, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BLUESPHEREBONUS", 0, SPR_SPHR, FF_FULLBRIGHT
+	{"BLUESPHERE", 0, SPR_SPHR, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BLUESPHEREBONUS", 0, SPR_SPHR, FF_FULLBRIGHT
 #ifdef MANIASPHERES
 							|FF_ANIMATE|FF_RANDOMANIM
 #endif
 							, -1, {NULL}, 1, 4, S_NULL, 0},
-	{"S_BLUESPHERESPARK", 0, SPR_SPHR, 0, 20, {NULL}, 0, 0, S_NULL, 0},
+	{"BLUESPHERESPARK", 0, SPR_SPHR, 0, 20, {NULL}, 0, 0, S_NULL, 0},
 
 	// Bomb Sphere
-	{"S_BOMBSPHERE1", 0, SPR_SPHR, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_BOMBSPHERE2, 0},
-	{"S_BOMBSPHERE2", 0, SPR_SPHR, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_BOMBSPHERE3, 0},
-	{"S_BOMBSPHERE3", 0, SPR_SPHR, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_BOMBSPHERE4, 0},
-	{"S_BOMBSPHERE4", 0, SPR_SPHR, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_BOMBSPHERE1, 0},
+	{"BOMBSPHERE1", 0, SPR_SPHR, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_BOMBSPHERE2, 0},
+	{"BOMBSPHERE2", 0, SPR_SPHR, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_BOMBSPHERE3, 0},
+	{"BOMBSPHERE3", 0, SPR_SPHR, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_BOMBSPHERE4, 0},
+	{"BOMBSPHERE4", 0, SPR_SPHR, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_BOMBSPHERE1, 0},
 
 	// NiGHTS Chip
-	{"S_NIGHTSCHIP", 0, SPR_NCHP, FF_FULLBRIGHT|FF_ANIMATE,    -1, {NULL}, 15, 2, S_NULL, 0},
-	{"S_NIGHTSCHIPBONUS", 0, SPR_NCHP, FF_FULLBRIGHT|FF_ANIMATE|16, -1, {NULL}, 15, 2, S_NULL, 0},
+	{"NIGHTSCHIP", 0, SPR_NCHP, FF_FULLBRIGHT|FF_ANIMATE,    -1, {NULL}, 15, 2, S_NULL, 0},
+	{"NIGHTSCHIPBONUS", 0, SPR_NCHP, FF_FULLBRIGHT|FF_ANIMATE|16, -1, {NULL}, 15, 2, S_NULL, 0},
 
 	// NiGHTS Star
-	{"S_NIGHTSSTAR", 0, SPR_NSTR, FF_ANIMATE, -1, {NULL}, 14, 2, S_NULL, 0},
-	{"S_NIGHTSSTARXMAS", 0, SPR_NSTR, 15, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSSTAR", 0, SPR_NSTR, FF_ANIMATE, -1, {NULL}, 14, 2, S_NULL, 0},
+	{"NIGHTSSTARXMAS", 0, SPR_NSTR, 15, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Gravity Well sprites for Egg Rock's Special Stage
-	{"S_GRAVWELLGREEN", 0, SPR_GWLG, FF_ANIMATE, -1, {NULL}, 2, 1, S_NULL, 0},
-	{"S_GRAVWELLRED", 0, SPR_GWLR, FF_ANIMATE, -1, {NULL}, 2, 1, S_NULL, 0},
+	{"GRAVWELLGREEN", 0, SPR_GWLG, FF_ANIMATE, -1, {NULL}, 2, 1, S_NULL, 0},
+	{"GRAVWELLRED", 0, SPR_GWLR, FF_ANIMATE, -1, {NULL}, 2, 1, S_NULL, 0},
 
 	// Individual Team Rings (now with shield attracting action! =P)
-	{"S_TEAMRING", 0, SPR_TRNG, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 23, 1, S_TEAMRING, 0},
+	{"TEAMRING", 0, SPR_TRNG, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 23, 1, S_TEAMRING, 0},
 
 	// Special Stage Token
-	{"S_TOKEN", 0, SPR_TOKE, FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 19, 1, S_TOKEN, 0},
+	{"TOKEN", 0, SPR_TOKE, FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 19, 1, S_TOKEN, 0},
 
 	// CTF Flags
-	{"S_REDFLAG", 0, SPR_RFLG, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BLUEFLAG", 0, SPR_BFLG, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"REDFLAG", 0, SPR_RFLG, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BLUEFLAG", 0, SPR_BFLG, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Emblem
-	{"S_EMBLEM1", 0, SPR_EMBM,  0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM2", 0, SPR_EMBM,  1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM3", 0, SPR_EMBM,  2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM4", 0, SPR_EMBM,  3, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM5", 0, SPR_EMBM,  4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM6", 0, SPR_EMBM,  5, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM7", 0, SPR_EMBM,  6, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM8", 0, SPR_EMBM,  7, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM9", 0, SPR_EMBM,  8, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM10", 0, SPR_EMBM,  9, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM11", 0, SPR_EMBM, 10, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM12", 0, SPR_EMBM, 11, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM13", 0, SPR_EMBM, 12, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM14", 0, SPR_EMBM, 13, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM15", 0, SPR_EMBM, 14, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM16", 0, SPR_EMBM, 15, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM17", 0, SPR_EMBM, 16, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM18", 0, SPR_EMBM, 17, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM19", 0, SPR_EMBM, 18, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM20", 0, SPR_EMBM, 19, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM21", 0, SPR_EMBM, 20, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM22", 0, SPR_EMBM, 21, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM23", 0, SPR_EMBM, 22, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM24", 0, SPR_EMBM, 23, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM25", 0, SPR_EMBM, 24, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_EMBLEM26", 0, SPR_EMBM, 25, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM1", 0, SPR_EMBM,  0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM2", 0, SPR_EMBM,  1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM3", 0, SPR_EMBM,  2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM4", 0, SPR_EMBM,  3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM5", 0, SPR_EMBM,  4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM6", 0, SPR_EMBM,  5, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM7", 0, SPR_EMBM,  6, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM8", 0, SPR_EMBM,  7, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM9", 0, SPR_EMBM,  8, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM10", 0, SPR_EMBM,  9, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM11", 0, SPR_EMBM, 10, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM12", 0, SPR_EMBM, 11, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM13", 0, SPR_EMBM, 12, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM14", 0, SPR_EMBM, 13, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM15", 0, SPR_EMBM, 14, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM16", 0, SPR_EMBM, 15, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM17", 0, SPR_EMBM, 16, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM18", 0, SPR_EMBM, 17, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM19", 0, SPR_EMBM, 18, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM20", 0, SPR_EMBM, 19, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM21", 0, SPR_EMBM, 20, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM22", 0, SPR_EMBM, 21, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM23", 0, SPR_EMBM, 22, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM24", 0, SPR_EMBM, 23, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM25", 0, SPR_EMBM, 24, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EMBLEM26", 0, SPR_EMBM, 25, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Chaos Emeralds
-	{"S_CEMG1", 0, SPR_CEMG, FF_FULLBRIGHT,   -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CEMG2", 0, SPR_CEMG, FF_FULLBRIGHT|1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CEMG3", 0, SPR_CEMG, FF_FULLBRIGHT|2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CEMG4", 0, SPR_CEMG, FF_FULLBRIGHT|3, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CEMG5", 0, SPR_CEMG, FF_FULLBRIGHT|4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CEMG6", 0, SPR_CEMG, FF_FULLBRIGHT|5, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CEMG7", 0, SPR_CEMG, FF_FULLBRIGHT|6, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEMG1", 0, SPR_CEMG, FF_FULLBRIGHT,   -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEMG2", 0, SPR_CEMG, FF_FULLBRIGHT|1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEMG3", 0, SPR_CEMG, FF_FULLBRIGHT|2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEMG4", 0, SPR_CEMG, FF_FULLBRIGHT|3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEMG5", 0, SPR_CEMG, FF_FULLBRIGHT|4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEMG6", 0, SPR_CEMG, FF_FULLBRIGHT|5, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEMG7", 0, SPR_CEMG, FF_FULLBRIGHT|6, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Emerald hunt shards
-	{"S_SHRD1", 0, SPR_SHRD, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_SHRD2", 0, SPR_SHRD, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_SHRD3", 0, SPR_SHRD, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SHRD1", 0, SPR_SHRD, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SHRD2", 0, SPR_SHRD, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SHRD3", 0, SPR_SHRD, 2, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Bubble Source
-	{"S_BUBBLES1", 0, SPR_BBLS, 0, 8, {A_BubbleSpawn}, 2048, 0, S_BUBBLES2, 0},
-	{"S_BUBBLES2", 0, SPR_BBLS, 1, 8, {A_BubbleCheck}, 0, 0, S_BUBBLES3, 0},
-	{"S_BUBBLES3", 0, SPR_BBLS, 2, 8, {A_BubbleSpawn}, 2048, 0, S_BUBBLES4, 0},
-	{"S_BUBBLES4", 0, SPR_BBLS, 3, 8, {A_BubbleCheck}, 0, 0, S_BUBBLES1, 0},
+	{"BUBBLES1", 0, SPR_BBLS, 0, 8, {A_BubbleSpawn}, 2048, 0, S_BUBBLES2, 0},
+	{"BUBBLES2", 0, SPR_BBLS, 1, 8, {A_BubbleCheck}, 0, 0, S_BUBBLES3, 0},
+	{"BUBBLES3", 0, SPR_BBLS, 2, 8, {A_BubbleSpawn}, 2048, 0, S_BUBBLES4, 0},
+	{"BUBBLES4", 0, SPR_BBLS, 3, 8, {A_BubbleCheck}, 0, 0, S_BUBBLES1, 0},
 
 	// Level End Sign
-	{"S_SIGN", 0, SPR_SIGN,                 0, -1, {A_SignPlayer}, -3, 0, S_NULL, 0},
-	{"S_SIGNSPIN1", 0, SPR_SIGN,                 0,  1,   {A_SignSpin}, 30, 0, S_SIGNSPIN2, 0},
-	{"S_SIGNSPIN2", 0, SPR_SIGN,                 0,  0,     {A_Repeat},  4, S_SIGNSPIN1, S_SIGNSPIN3, 0},
-	{"S_SIGNSPIN3", 0, SPR_SIGN,                 0,  0, {A_SignPlayer}, -2, 0, S_SIGNSPIN4, 0},
-	{"S_SIGNSPIN4", 0, SPR_SIGN,                 0,  1,   {A_SignSpin}, 30, 0, S_SIGNSPIN5, 0},
-	{"S_SIGNSPIN5", 0, SPR_SIGN,                 0,  0,     {A_Repeat},  4, S_SIGNSPIN4, S_SIGNSPIN6, 0},
-	{"S_SIGNSPIN6", 0, SPR_SIGN,                 0,  0, {A_SignPlayer}, -3, 0, S_SIGNSPIN1, 0},
-	{"S_SIGNPLAYER", 0, SPR_SIGN,                 0,  1, {A_SignPlayer}, -1, 0, S_SIGNSLOW, 0},
-	{"S_SIGNSLOW", 0, SPR_SIGN,                 0,  1,   {A_SignSpin}, 30, 0, S_SIGNSLOW, 0},
-	{"S_SIGNSTOP", 0, SPR_SIGN,                 0, -1,         {NULL},  0, 0, S_NULL, 0},
-	{"S_SIGNBOARD", 0, SPR_SIGN, FF_PAPERSPRITE| 2, -1,         {NULL},  0, 0, S_NULL, 0},
-	{"S_EGGMANSIGN", 0, SPR_SIGN, FF_PAPERSPRITE| 1, -1,         {NULL},  0, 29, S_NULL, 0},
-	{"S_CLEARSIGN", 0, SPR_SIGN, FF_PAPERSPRITE|18, -1,         {NULL},  0, 29, S_NULL, 0},
+	{"SIGN", 0, SPR_SIGN,                 0, -1, {A_SignPlayer}, -3, 0, S_NULL, 0},
+	{"SIGNSPIN1", 0, SPR_SIGN,                 0,  1,   {A_SignSpin}, 30, 0, S_SIGNSPIN2, 0},
+	{"SIGNSPIN2", 0, SPR_SIGN,                 0,  0,     {A_Repeat},  4, S_SIGNSPIN1, S_SIGNSPIN3, 0},
+	{"SIGNSPIN3", 0, SPR_SIGN,                 0,  0, {A_SignPlayer}, -2, 0, S_SIGNSPIN4, 0},
+	{"SIGNSPIN4", 0, SPR_SIGN,                 0,  1,   {A_SignSpin}, 30, 0, S_SIGNSPIN5, 0},
+	{"SIGNSPIN5", 0, SPR_SIGN,                 0,  0,     {A_Repeat},  4, S_SIGNSPIN4, S_SIGNSPIN6, 0},
+	{"SIGNSPIN6", 0, SPR_SIGN,                 0,  0, {A_SignPlayer}, -3, 0, S_SIGNSPIN1, 0},
+	{"SIGNPLAYER", 0, SPR_SIGN,                 0,  1, {A_SignPlayer}, -1, 0, S_SIGNSLOW, 0},
+	{"SIGNSLOW", 0, SPR_SIGN,                 0,  1,   {A_SignSpin}, 30, 0, S_SIGNSLOW, 0},
+	{"SIGNSTOP", 0, SPR_SIGN,                 0, -1,         {NULL},  0, 0, S_NULL, 0},
+	{"SIGNBOARD", 0, SPR_SIGN, FF_PAPERSPRITE| 2, -1,         {NULL},  0, 0, S_NULL, 0},
+	{"EGGMANSIGN", 0, SPR_SIGN, FF_PAPERSPRITE| 1, -1,         {NULL},  0, 29, S_NULL, 0},
+	{"CLEARSIGN", 0, SPR_SIGN, FF_PAPERSPRITE|18, -1,         {NULL},  0, 29, S_NULL, 0},
 
 	// Spike Ball
-	{"S_SPIKEBALL1", 0, SPR_SPIK, 0, 1, {NULL}, 0, 0, S_SPIKEBALL2, 0},
-	{"S_SPIKEBALL2", 0, SPR_SPIK, 1, 1, {NULL}, 0, 0, S_SPIKEBALL3, 0},
-	{"S_SPIKEBALL3", 0, SPR_SPIK, 2, 1, {NULL}, 0, 0, S_SPIKEBALL4, 0},
-	{"S_SPIKEBALL4", 0, SPR_SPIK, 3, 1, {NULL}, 0, 0, S_SPIKEBALL5, 0},
-	{"S_SPIKEBALL5", 0, SPR_SPIK, 4, 1, {NULL}, 0, 0, S_SPIKEBALL6, 0},
-	{"S_SPIKEBALL6", 0, SPR_SPIK, 5, 1, {NULL}, 0, 0, S_SPIKEBALL7, 0},
-	{"S_SPIKEBALL7", 0, SPR_SPIK, 6, 1, {NULL}, 0, 0, S_SPIKEBALL8, 0},
-	{"S_SPIKEBALL8", 0, SPR_SPIK, 7, 1, {NULL}, 0, 0, S_SPIKEBALL1, 0},
+	{"SPIKEBALL1", 0, SPR_SPIK, 0, 1, {NULL}, 0, 0, S_SPIKEBALL2, 0},
+	{"SPIKEBALL2", 0, SPR_SPIK, 1, 1, {NULL}, 0, 0, S_SPIKEBALL3, 0},
+	{"SPIKEBALL3", 0, SPR_SPIK, 2, 1, {NULL}, 0, 0, S_SPIKEBALL4, 0},
+	{"SPIKEBALL4", 0, SPR_SPIK, 3, 1, {NULL}, 0, 0, S_SPIKEBALL5, 0},
+	{"SPIKEBALL5", 0, SPR_SPIK, 4, 1, {NULL}, 0, 0, S_SPIKEBALL6, 0},
+	{"SPIKEBALL6", 0, SPR_SPIK, 5, 1, {NULL}, 0, 0, S_SPIKEBALL7, 0},
+	{"SPIKEBALL7", 0, SPR_SPIK, 6, 1, {NULL}, 0, 0, S_SPIKEBALL8, 0},
+	{"SPIKEBALL8", 0, SPR_SPIK, 7, 1, {NULL}, 0, 0, S_SPIKEBALL1, 0},
 
 	// Elemental Shield's Spawn
-	{"S_SPINFIRE1", 0, SPR_SFLM, FF_FULLBRIGHT,   2, {NULL}, 0, 0, S_SPINFIRE2, 0},
-	{"S_SPINFIRE2", 0, SPR_SFLM, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_SPINFIRE3, 0},
-	{"S_SPINFIRE3", 0, SPR_SFLM, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_SPINFIRE4, 0},
-	{"S_SPINFIRE4", 0, SPR_SFLM, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_SPINFIRE5, 0},
-	{"S_SPINFIRE5", 0, SPR_SFLM, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_SPINFIRE6, 0},
-	{"S_SPINFIRE6", 0, SPR_SFLM, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_SPINFIRE1, 0},
-
-	{"S_TEAM_SPINFIRE1", 0, SPR_TFLM, FF_FULLBRIGHT,   2, {NULL}, 0, 0, S_TEAM_SPINFIRE2, 0},
-	{"S_TEAM_SPINFIRE2", 0, SPR_TFLM, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE3, 0},
-	{"S_TEAM_SPINFIRE3", 0, SPR_TFLM, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE4, 0},
-	{"S_TEAM_SPINFIRE4", 0, SPR_TFLM, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE5, 0},
-	{"S_TEAM_SPINFIRE5", 0, SPR_TFLM, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE6, 0},
-	{"S_TEAM_SPINFIRE6", 0, SPR_TFLM, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE1, 0},
+	{"SPINFIRE1", 0, SPR_SFLM, FF_FULLBRIGHT,   2, {NULL}, 0, 0, S_SPINFIRE2, 0},
+	{"SPINFIRE2", 0, SPR_SFLM, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_SPINFIRE3, 0},
+	{"SPINFIRE3", 0, SPR_SFLM, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_SPINFIRE4, 0},
+	{"SPINFIRE4", 0, SPR_SFLM, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_SPINFIRE5, 0},
+	{"SPINFIRE5", 0, SPR_SFLM, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_SPINFIRE6, 0},
+	{"SPINFIRE6", 0, SPR_SFLM, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_SPINFIRE1, 0},
+
+	{"TEAM_SPINFIRE1", 0, SPR_TFLM, FF_FULLBRIGHT,   2, {NULL}, 0, 0, S_TEAM_SPINFIRE2, 0},
+	{"TEAM_SPINFIRE2", 0, SPR_TFLM, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE3, 0},
+	{"TEAM_SPINFIRE3", 0, SPR_TFLM, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE4, 0},
+	{"TEAM_SPINFIRE4", 0, SPR_TFLM, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE5, 0},
+	{"TEAM_SPINFIRE5", 0, SPR_TFLM, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE6, 0},
+	{"TEAM_SPINFIRE6", 0, SPR_TFLM, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE1, 0},
 
 	// Floor Spike
-	{"S_SPIKE1", 0, SPR_USPK, 0,-1, {A_SpikeRetract}, 1, 0, S_SPIKE2, 0},  // -- Fully extended
-	{"S_SPIKE2", 0, SPR_USPK, 1, 2, {A_Pain},         0, 0, S_SPIKE3, 0},
-	{"S_SPIKE3", 0, SPR_USPK, 2, 2, {NULL},           0, 0, S_SPIKE4, 0},
-	{"S_SPIKE4", 0, SPR_USPK, 3,-1, {A_SpikeRetract}, 0, 0, S_SPIKE5, 0},  // -- Fully retracted
-	{"S_SPIKE5", 0, SPR_USPK, 2, 2, {A_Pain},         0, 0, S_SPIKE6, 0},
-	{"S_SPIKE6", 0, SPR_USPK, 1, 2, {NULL},           0, 0, S_SPIKE1, 0},
-	{"S_SPIKED1", 0, SPR_USPK, 4,-1, {NULL}, 0, 0, S_NULL, 0},  // -- Busted spike particles
-	{"S_SPIKED2", 0, SPR_USPK, 5,-1, {NULL}, 0, 0, S_NULL, 0},
+	{"SPIKE1", 0, SPR_USPK, 0,-1, {A_SpikeRetract}, 1, 0, S_SPIKE2, 0},  // -- Fully extended
+	{"SPIKE2", 0, SPR_USPK, 1, 2, {A_Pain},         0, 0, S_SPIKE3, 0},
+	{"SPIKE3", 0, SPR_USPK, 2, 2, {NULL},           0, 0, S_SPIKE4, 0},
+	{"SPIKE4", 0, SPR_USPK, 3,-1, {A_SpikeRetract}, 0, 0, S_SPIKE5, 0},  // -- Fully retracted
+	{"SPIKE5", 0, SPR_USPK, 2, 2, {A_Pain},         0, 0, S_SPIKE6, 0},
+	{"SPIKE6", 0, SPR_USPK, 1, 2, {NULL},           0, 0, S_SPIKE1, 0},
+	{"SPIKED1", 0, SPR_USPK, 4,-1, {NULL}, 0, 0, S_NULL, 0},  // -- Busted spike particles
+	{"SPIKED2", 0, SPR_USPK, 5,-1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Wall Spike
-	{"S_WALLSPIKE1", 0, SPR_WSPK, 0|FF_PAPERSPRITE,-1, {A_SpikeRetract}, 1, 0, S_WALLSPIKE2, 0},  // -- Fully extended
-	{"S_WALLSPIKE2", 0, SPR_WSPK, 1|FF_PAPERSPRITE, 2, {A_Pain},         0, 0, S_WALLSPIKE3, 0},
-	{"S_WALLSPIKE3", 0, SPR_WSPK, 2|FF_PAPERSPRITE, 2, {NULL},           0, 0, S_WALLSPIKE4, 0},
-	{"S_WALLSPIKE4", 0, SPR_WSPK, 3|FF_PAPERSPRITE,-1, {A_SpikeRetract}, 0, 0, S_WALLSPIKE5, 0},  // -- Fully retracted
-	{"S_WALLSPIKE5", 0, SPR_WSPK, 2|FF_PAPERSPRITE, 2, {A_Pain},         0, 0, S_WALLSPIKE6, 0},
-	{"S_WALLSPIKE6", 0, SPR_WSPK, 1|FF_PAPERSPRITE, 2, {NULL},           0, 0, S_WALLSPIKE1, 0},
-	{"S_WALLSPIKEBASE", 0, SPR_WSPB, 0|FF_PAPERSPRITE,-1, {NULL}, 0, 0, S_NULL, 0},  // -- Base
-	{"S_WALLSPIKED1", 0, SPR_WSPK, 4,-1, {NULL}, 0, 0, S_NULL, 0},  // -- Busted spike particles
-	{"S_WALLSPIKED2", 0, SPR_WSPK, 5,-1, {NULL}, 0, 0, S_NULL, 0},
+	{"WALLSPIKE1", 0, SPR_WSPK, 0|FF_PAPERSPRITE,-1, {A_SpikeRetract}, 1, 0, S_WALLSPIKE2, 0},  // -- Fully extended
+	{"WALLSPIKE2", 0, SPR_WSPK, 1|FF_PAPERSPRITE, 2, {A_Pain},         0, 0, S_WALLSPIKE3, 0},
+	{"WALLSPIKE3", 0, SPR_WSPK, 2|FF_PAPERSPRITE, 2, {NULL},           0, 0, S_WALLSPIKE4, 0},
+	{"WALLSPIKE4", 0, SPR_WSPK, 3|FF_PAPERSPRITE,-1, {A_SpikeRetract}, 0, 0, S_WALLSPIKE5, 0},  // -- Fully retracted
+	{"WALLSPIKE5", 0, SPR_WSPK, 2|FF_PAPERSPRITE, 2, {A_Pain},         0, 0, S_WALLSPIKE6, 0},
+	{"WALLSPIKE6", 0, SPR_WSPK, 1|FF_PAPERSPRITE, 2, {NULL},           0, 0, S_WALLSPIKE1, 0},
+	{"WALLSPIKEBASE", 0, SPR_WSPB, 0|FF_PAPERSPRITE,-1, {NULL}, 0, 0, S_NULL, 0},  // -- Base
+	{"WALLSPIKED1", 0, SPR_WSPK, 4,-1, {NULL}, 0, 0, S_NULL, 0},  // -- Busted spike particles
+	{"WALLSPIKED2", 0, SPR_WSPK, 5,-1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Starpost
-	{"S_STARPOST_IDLE", 0, SPR_STPT, 0            , -1, {NULL},  0, 0, S_NULL, 0},
-	{"S_STARPOST_FLASH", 0, SPR_STPT, FF_ANIMATE|17, -1, {NULL},  5, 1, S_NULL, 0},
-	{"S_STARPOST_STARTSPIN", 0, SPR_STPT, FF_ANIMATE|13,  2, {NULL},  1, 1, S_STARPOST_SPIN, 0},
-	{"S_STARPOST_SPIN", 0, SPR_STPT, FF_ANIMATE|1 , 23, {NULL}, 11, 1, S_STARPOST_ENDSPIN, 0},
-	{"S_STARPOST_ENDSPIN", 0, SPR_STPT, FF_ANIMATE|15,  2, {NULL},  1, 1, S_STARPOST_FLASH, 0},
+	{"STARPOST_IDLE", 0, SPR_STPT, 0            , -1, {NULL},  0, 0, S_NULL, 0},
+	{"STARPOST_FLASH", 0, SPR_STPT, FF_ANIMATE|17, -1, {NULL},  5, 1, S_NULL, 0},
+	{"STARPOST_STARTSPIN", 0, SPR_STPT, FF_ANIMATE|13,  2, {NULL},  1, 1, S_STARPOST_SPIN, 0},
+	{"STARPOST_SPIN", 0, SPR_STPT, FF_ANIMATE|1 , 23, {NULL}, 11, 1, S_STARPOST_ENDSPIN, 0},
+	{"STARPOST_ENDSPIN", 0, SPR_STPT, FF_ANIMATE|15,  2, {NULL},  1, 1, S_STARPOST_FLASH, 0},
 
 	// Big floating mine
-	{"S_BIGMINE_IDLE", 0, SPR_BMNE, 0,  2, {A_Look},      ((224<<FRACBITS)|1), 0, S_BIGMINE_IDLE, 0},
-	{"S_BIGMINE_ALERT1", 0, SPR_BMNE, 1,  2, {A_MineRange}, 112,                 0, S_BIGMINE_ALERT2, 0},
-	{"S_BIGMINE_ALERT2", 0, SPR_BMNE, 2,  2, {A_MineRange}, 112,                 0, S_BIGMINE_ALERT3, 0},
-	{"S_BIGMINE_ALERT3", 0, SPR_BMNE, 0,  1, {A_Look},      ((224<<FRACBITS)|1), 1, S_BIGMINE_IDLE, 0},
-	{"S_BIGMINE_SET1", 0, SPR_BMNE, 3, 25, {A_Pain},           0,            0, S_BIGMINE_SET2, 0},
-	{"S_BIGMINE_SET1", 0, SPR_BMNE, 3, 10, {A_SetObjectFlags}, MF_SHOOTABLE, 1, S_BIGMINE_SET3, 0},
-	{"S_BIGMINE_SET3", 0, SPR_BMNE, 3,  1, {A_MineExplode},    0,            0, S_BIGMINE_BLAST1, 0},
-	{"S_BIGMINE_BLAST1", 0, SPR_BMNB,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_BIGMINE_BLAST2, 0},
-	{"S_BIGMINE_BLAST2", 0, SPR_BMNB, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_BIGMINE_BLAST3, 0},
-	{"S_BIGMINE_BLAST3", 0, SPR_BMNB, 2|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_BIGMINE_BLAST4, 0},
-	{"S_BIGMINE_BLAST4", 0, SPR_BMNB, 3|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_BIGMINE_BLAST5, 0},
-	{"S_BIGMINE_BLAST5", 0, SPR_NULL, 0, 35, {NULL}, 0, 0, S_NULL, 0},
+	{"BIGMINE_IDLE", 0, SPR_BMNE, 0,  2, {A_Look},      ((224<<FRACBITS)|1), 0, S_BIGMINE_IDLE, 0},
+	{"BIGMINE_ALERT1", 0, SPR_BMNE, 1,  2, {A_MineRange}, 112,                 0, S_BIGMINE_ALERT2, 0},
+	{"BIGMINE_ALERT2", 0, SPR_BMNE, 2,  2, {A_MineRange}, 112,                 0, S_BIGMINE_ALERT3, 0},
+	{"BIGMINE_ALERT3", 0, SPR_BMNE, 0,  1, {A_Look},      ((224<<FRACBITS)|1), 1, S_BIGMINE_IDLE, 0},
+	{"BIGMINE_SET1", 0, SPR_BMNE, 3, 25, {A_Pain},           0,            0, S_BIGMINE_SET2, 0},
+	{"BIGMINE_SET1", 0, SPR_BMNE, 3, 10, {A_SetObjectFlags}, MF_SHOOTABLE, 1, S_BIGMINE_SET3, 0},
+	{"BIGMINE_SET3", 0, SPR_BMNE, 3,  1, {A_MineExplode},    0,            0, S_BIGMINE_BLAST1, 0},
+	{"BIGMINE_BLAST1", 0, SPR_BMNB,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_BIGMINE_BLAST2, 0},
+	{"BIGMINE_BLAST2", 0, SPR_BMNB, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_BIGMINE_BLAST3, 0},
+	{"BIGMINE_BLAST3", 0, SPR_BMNB, 2|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_BIGMINE_BLAST4, 0},
+	{"BIGMINE_BLAST4", 0, SPR_BMNB, 3|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_BIGMINE_BLAST5, 0},
+	{"BIGMINE_BLAST5", 0, SPR_NULL, 0, 35, {NULL}, 0, 0, S_NULL, 0},
 
 	// Cannon launcher
-	{"S_CANNONLAUNCHER1", 0, SPR_NULL, 0, 1,    {A_FindTarget},     MT_PLAYER,         0, S_CANNONLAUNCHER2, 0},
-	{"S_CANNONLAUNCHER2", 0, SPR_NULL, 0, 1,       {A_LobShot}, MT_CANNONBALL, 4*TICRATE, S_CANNONLAUNCHER3, 0},
-	{"S_CANNONLAUNCHER3", 0, SPR_NULL, 0, 2, {A_SetRandomTics},     TICRATE/2, 3*TICRATE, S_CANNONLAUNCHER1, 0},
+	{"CANNONLAUNCHER1", 0, SPR_NULL, 0, 1,    {A_FindTarget},     MT_PLAYER,         0, S_CANNONLAUNCHER2, 0},
+	{"CANNONLAUNCHER2", 0, SPR_NULL, 0, 1,       {A_LobShot}, MT_CANNONBALL, 4*TICRATE, S_CANNONLAUNCHER3, 0},
+	{"CANNONLAUNCHER3", 0, SPR_NULL, 0, 2, {A_SetRandomTics},     TICRATE/2, 3*TICRATE, S_CANNONLAUNCHER1, 0},
 
 	// Monitor Miscellany
-	{"S_BOXSPARKLE1", 0, SPR_NSPK, 0, 16, {NULL}, 0, 0, S_BOXSPARKLE2, 0},
-	{"S_BOXSPARKLE2", 0, SPR_NSPK, 1, 12, {NULL}, 0, 0, S_BOXSPARKLE3, 0},
-	{"S_BOXSPARKLE3", 0, SPR_NSPK, 2,  8, {NULL}, 0, 0, S_BOXSPARKLE4, 0},
-	{"S_BOXSPARKLE4", 0, SPR_NSPK, 3,  4, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_BOX_FLICKER", 0, SPR_MSTV, 0,  1, {NULL}, 0, 0, S_SPAWNSTATE, 0},
-	{"S_BOX_POP1", 0, SPR_MSTV, 0,  4, {A_MonitorPop}, 0, 0, S_BOX_POP2, 0},
-	{"S_BOX_POP2", 0, SPR_MSTV, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_GOLDBOX_FLICKER", 0, SPR_XLTV, 0,  1, {NULL}, 0, 0, S_SPAWNSTATE, 0},
-	{"S_GOLDBOX_OFF1", 0, SPR_XLTV, 1, 89, {A_GoldMonitorPop}, 0, 0, S_GOLDBOX_OFF2, 0},
-	{"S_GOLDBOX_OFF2", 0, SPR_XLTV, 2,  4, {A_PlayAttackSound}, 0, 0, S_GOLDBOX_OFF3, 0},
-	{"S_GOLDBOX_OFF3", 0, SPR_XLTV, 3,  4, {NULL}, 0, 0, S_GOLDBOX_OFF4, 0},
-	{"S_GOLDBOX_OFF4", 0, SPR_XLTV, 4,  4, {NULL}, 0, 0, S_GOLDBOX_OFF5, 0},
-	{"S_GOLDBOX_OFF5", 0, SPR_XLTV, 5,  2, {NULL}, 0, 0, S_GOLDBOX_OFF6, 0},
-	{"S_GOLDBOX_OFF6", 0, SPR_XLTV, 6,  2, {NULL}, 0, 0, S_GOLDBOX_OFF7, 0},
-	{"S_GOLDBOX_OFF7", 0, SPR_XLTV, 6,  0, {A_GoldMonitorRestore}, 0, 0, S_SPAWNSTATE, 0},
+	{"BOXSPARKLE1", 0, SPR_NSPK, 0, 16, {NULL}, 0, 0, S_BOXSPARKLE2, 0},
+	{"BOXSPARKLE2", 0, SPR_NSPK, 1, 12, {NULL}, 0, 0, S_BOXSPARKLE3, 0},
+	{"BOXSPARKLE3", 0, SPR_NSPK, 2,  8, {NULL}, 0, 0, S_BOXSPARKLE4, 0},
+	{"BOXSPARKLE4", 0, SPR_NSPK, 3,  4, {NULL}, 0, 0, S_NULL, 0},
+
+	{"BOX_FLICKER", 0, SPR_MSTV, 0,  1, {NULL}, 0, 0, S_SPAWNSTATE, 0},
+	{"BOX_POP1", 0, SPR_MSTV, 0,  4, {A_MonitorPop}, 0, 0, S_BOX_POP2, 0},
+	{"BOX_POP2", 0, SPR_MSTV, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+
+	{"GOLDBOX_FLICKER", 0, SPR_XLTV, 0,  1, {NULL}, 0, 0, S_SPAWNSTATE, 0},
+	{"GOLDBOX_OFF1", 0, SPR_XLTV, 1, 89, {A_GoldMonitorPop}, 0, 0, S_GOLDBOX_OFF2, 0},
+	{"GOLDBOX_OFF2", 0, SPR_XLTV, 2,  4, {A_PlayAttackSound}, 0, 0, S_GOLDBOX_OFF3, 0},
+	{"GOLDBOX_OFF3", 0, SPR_XLTV, 3,  4, {NULL}, 0, 0, S_GOLDBOX_OFF4, 0},
+	{"GOLDBOX_OFF4", 0, SPR_XLTV, 4,  4, {NULL}, 0, 0, S_GOLDBOX_OFF5, 0},
+	{"GOLDBOX_OFF5", 0, SPR_XLTV, 5,  2, {NULL}, 0, 0, S_GOLDBOX_OFF6, 0},
+	{"GOLDBOX_OFF6", 0, SPR_XLTV, 6,  2, {NULL}, 0, 0, S_GOLDBOX_OFF7, 0},
+	{"GOLDBOX_OFF7", 0, SPR_XLTV, 6,  0, {A_GoldMonitorRestore}, 0, 0, S_SPAWNSTATE, 0},
 
 	// Monitor States (one per box)
-	{"S_MYSTERY_BOX", 0, SPR_TVMY, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_RING_BOX", 0, SPR_TVRI, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_PITY_BOX", 0, SPR_TVPI, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_ATTRACT_BOX", 0, SPR_TVAT, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_FORCE_BOX", 0, SPR_TVFO, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_ARMAGEDDON_BOX", 0, SPR_TVAR, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_WHIRLWIND_BOX", 0, SPR_TVWW, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_ELEMENTAL_BOX", 0, SPR_TVEL, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_SNEAKERS_BOX", 0, SPR_TVSS, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_INVULN_BOX", 0, SPR_TVIV, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_1UP_BOX", 0, SPR_TV1U, 0, 2, {A_1upThinker}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_EGGMAN_BOX", 0, SPR_TVEG, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_MIXUP_BOX", 0, SPR_TVMX, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_GRAVITY_BOX", 0, SPR_TVGV, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_RECYCLER_BOX", 0, SPR_TVRC, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_SCORE1K_BOX", 0, SPR_TV1K, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_SCORE10K_BOX", 0, SPR_TVTK, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_FLAMEAURA_BOX", 0, SPR_TVFL, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_BUBBLEWRAP_BOX", 0, SPR_TVBB, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
-	{"S_THUNDERCOIN_BOX", 0, SPR_TVZP, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"MYSTERY_BOX", 0, SPR_TVMY, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"RING_BOX", 0, SPR_TVRI, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"PITY_BOX", 0, SPR_TVPI, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"ATTRACT_BOX", 0, SPR_TVAT, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"FORCE_BOX", 0, SPR_TVFO, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"ARMAGEDDON_BOX", 0, SPR_TVAR, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"WHIRLWIND_BOX", 0, SPR_TVWW, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"ELEMENTAL_BOX", 0, SPR_TVEL, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"SNEAKERS_BOX", 0, SPR_TVSS, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"INVULN_BOX", 0, SPR_TVIV, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"1UP_BOX", 0, SPR_TV1U, 0, 2, {A_1upThinker}, 0, 0, S_BOX_FLICKER, 0},
+	{"EGGMAN_BOX", 0, SPR_TVEG, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"MIXUP_BOX", 0, SPR_TVMX, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"GRAVITY_BOX", 0, SPR_TVGV, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"RECYCLER_BOX", 0, SPR_TVRC, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"SCORE1K_BOX", 0, SPR_TV1K, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"SCORE10K_BOX", 0, SPR_TVTK, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"FLAMEAURA_BOX", 0, SPR_TVFL, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"BUBBLEWRAP_BOX", 0, SPR_TVBB, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
+	{"THUNDERCOIN_BOX", 0, SPR_TVZP, 0, 2, {NULL}, 0, 0, S_BOX_FLICKER, 0},
 
 	// Gold Repeat Monitor States (one per box)
-	{"S_PITY_GOLDBOX", 0, SPR_TVPI, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
-	{"S_ATTRACT_GOLDBOX", 0, SPR_TVAT, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
-	{"S_FORCE_GOLDBOX", 0, SPR_TVFO, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
-	{"S_ARMAGEDDON_GOLDBOX", 0, SPR_TVAR, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
-	{"S_WHIRLWIND_GOLDBOX", 0, SPR_TVWW, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
-	{"S_ELEMENTAL_GOLDBOX", 0, SPR_TVEL, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
-	{"S_SNEAKERS_GOLDBOX", 0, SPR_TVSS, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
-	{"S_INVULN_GOLDBOX", 0, SPR_TVIV, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
-	{"S_EGGMAN_GOLDBOX", 0, SPR_TVEG, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
-	{"S_GRAVITY_GOLDBOX", 0, SPR_TVGV, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
-	{"S_FLAMEAURA_GOLDBOX", 0, SPR_TVFL, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
-	{"S_BUBBLEWRAP_GOLDBOX", 0, SPR_TVBB, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
-	{"S_THUNDERCOIN_GOLDBOX", 0, SPR_TVZP, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"PITY_GOLDBOX", 0, SPR_TVPI, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"ATTRACT_GOLDBOX", 0, SPR_TVAT, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"FORCE_GOLDBOX", 0, SPR_TVFO, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"ARMAGEDDON_GOLDBOX", 0, SPR_TVAR, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"WHIRLWIND_GOLDBOX", 0, SPR_TVWW, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"ELEMENTAL_GOLDBOX", 0, SPR_TVEL, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"SNEAKERS_GOLDBOX", 0, SPR_TVSS, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"INVULN_GOLDBOX", 0, SPR_TVIV, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"EGGMAN_GOLDBOX", 0, SPR_TVEG, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"GRAVITY_GOLDBOX", 0, SPR_TVGV, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"FLAMEAURA_GOLDBOX", 0, SPR_TVFL, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"BUBBLEWRAP_GOLDBOX", 0, SPR_TVBB, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
+	{"THUNDERCOIN_GOLDBOX", 0, SPR_TVZP, 1, 2, {A_GoldMonitorSparkle}, 0, 0, S_GOLDBOX_FLICKER, 0},
 
 	// Team Ring Boxes (these are special)
-	{"S_RING_REDBOX1", 0, SPR_TRRI, 0, 2, {NULL}, 0, 0, S_RING_REDBOX2, 0},
-	{"S_RING_REDBOX2", 0, SPR_TRRI, 1, 1, {NULL}, 0, 0, S_RING_REDBOX1, 0},
-	{"S_REDBOX_POP1", 0, SPR_TRRI, 1, 4, {A_MonitorPop}, 0, 0, S_REDBOX_POP2, 0},
-	{"S_REDBOX_POP2", 0, SPR_TRRI, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"RING_REDBOX1", 0, SPR_TRRI, 0, 2, {NULL}, 0, 0, S_RING_REDBOX2, 0},
+	{"RING_REDBOX2", 0, SPR_TRRI, 1, 1, {NULL}, 0, 0, S_RING_REDBOX1, 0},
+	{"REDBOX_POP1", 0, SPR_TRRI, 1, 4, {A_MonitorPop}, 0, 0, S_REDBOX_POP2, 0},
+	{"REDBOX_POP2", 0, SPR_TRRI, 2, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_RING_BLUEBOX1", 0, SPR_TBRI, 0, 2, {NULL}, 0, 0, S_RING_BLUEBOX2, 0},
-	{"S_RING_BLUEBOX2", 0, SPR_TBRI, 1, 1, {NULL}, 0, 0, S_RING_BLUEBOX1, 0},
-	{"S_BLUEBOX_POP1", 0, SPR_TBRI, 1, 4, {A_MonitorPop}, 0, 0, S_BLUEBOX_POP2, 0},
-	{"S_BLUEBOX_POP2", 0, SPR_TBRI, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"RING_BLUEBOX1", 0, SPR_TBRI, 0, 2, {NULL}, 0, 0, S_RING_BLUEBOX2, 0},
+	{"RING_BLUEBOX2", 0, SPR_TBRI, 1, 1, {NULL}, 0, 0, S_RING_BLUEBOX1, 0},
+	{"BLUEBOX_POP1", 0, SPR_TBRI, 1, 4, {A_MonitorPop}, 0, 0, S_BLUEBOX_POP2, 0},
+	{"BLUEBOX_POP2", 0, SPR_TBRI, 2, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Box Icons -- 2 states each, animation and action
-	{"S_RING_ICON1", 0, SPR_TVRI, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_RING_ICON2, 0},
-	{"S_RING_ICON2", 0, SPR_TVRI, 2, 18, {A_RingBox}, 0, 0, S_NULL, 0},
+	{"RING_ICON1", 0, SPR_TVRI, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_RING_ICON2, 0},
+	{"RING_ICON2", 0, SPR_TVRI, 2, 18, {A_RingBox}, 0, 0, S_NULL, 0},
 
-	{"S_PITY_ICON1", 0, SPR_TVPI, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_PITY_ICON2, 0},
-	{"S_PITY_ICON2", 0, SPR_TVPI, 2, 18, {A_GiveShield}, SH_PITY, 0, S_NULL, 0},
+	{"PITY_ICON1", 0, SPR_TVPI, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_PITY_ICON2, 0},
+	{"PITY_ICON2", 0, SPR_TVPI, 2, 18, {A_GiveShield}, SH_PITY, 0, S_NULL, 0},
 
-	{"S_ATTRACT_ICON1", 0, SPR_TVAT, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_ATTRACT_ICON2, 0},
-	{"S_ATTRACT_ICON2", 0, SPR_TVAT, 2, 18, {A_GiveShield}, SH_ATTRACT, 0, S_NULL, 0},
+	{"ATTRACT_ICON1", 0, SPR_TVAT, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_ATTRACT_ICON2, 0},
+	{"ATTRACT_ICON2", 0, SPR_TVAT, 2, 18, {A_GiveShield}, SH_ATTRACT, 0, S_NULL, 0},
 
-	{"S_FORCE_ICON1", 0, SPR_TVFO, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_FORCE_ICON2, 0},
-	{"S_FORCE_ICON2", 0, SPR_TVFO, 2, 18, {A_GiveShield}, SH_FORCE|1, 0, S_NULL, 0},
+	{"FORCE_ICON1", 0, SPR_TVFO, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_FORCE_ICON2, 0},
+	{"FORCE_ICON2", 0, SPR_TVFO, 2, 18, {A_GiveShield}, SH_FORCE|1, 0, S_NULL, 0},
 
-	{"S_ARMAGEDDON_ICON1", 0, SPR_TVAR, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_ARMAGEDDON_ICON2, 0},
-	{"S_ARMAGEDDON_ICON2", 0, SPR_TVAR, 2, 18, {A_GiveShield}, SH_ARMAGEDDON, 0, S_NULL, 0},
+	{"ARMAGEDDON_ICON1", 0, SPR_TVAR, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_ARMAGEDDON_ICON2, 0},
+	{"ARMAGEDDON_ICON2", 0, SPR_TVAR, 2, 18, {A_GiveShield}, SH_ARMAGEDDON, 0, S_NULL, 0},
 
-	{"S_WHIRLWIND_ICON1", 0, SPR_TVWW, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_WHIRLWIND_ICON2, 0},
-	{"S_WHIRLWIND_ICON2", 0, SPR_TVWW, 2, 18, {A_GiveShield}, SH_WHIRLWIND, 0, S_NULL, 0},
+	{"WHIRLWIND_ICON1", 0, SPR_TVWW, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_WHIRLWIND_ICON2, 0},
+	{"WHIRLWIND_ICON2", 0, SPR_TVWW, 2, 18, {A_GiveShield}, SH_WHIRLWIND, 0, S_NULL, 0},
 
-	{"S_ELEMENTAL_ICON1", 0, SPR_TVEL, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_ELEMENTAL_ICON2, 0},
-	{"S_ELEMENTAL_ICON2", 0, SPR_TVEL, 2, 18, {A_GiveShield}, SH_ELEMENTAL, 0, S_NULL, 0},
+	{"ELEMENTAL_ICON1", 0, SPR_TVEL, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_ELEMENTAL_ICON2, 0},
+	{"ELEMENTAL_ICON2", 0, SPR_TVEL, 2, 18, {A_GiveShield}, SH_ELEMENTAL, 0, S_NULL, 0},
 
-	{"S_SNEAKERS_ICON1", 0, SPR_TVSS, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_SNEAKERS_ICON2, 0},
-	{"S_SNEAKERS_ICON2", 0, SPR_TVSS, 2, 18, {A_SuperSneakers}, 0, 0, S_NULL, 0},
+	{"SNEAKERS_ICON1", 0, SPR_TVSS, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_SNEAKERS_ICON2, 0},
+	{"SNEAKERS_ICON2", 0, SPR_TVSS, 2, 18, {A_SuperSneakers}, 0, 0, S_NULL, 0},
 
-	{"S_INVULN_ICON1", 0, SPR_TVIV, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_INVULN_ICON2, 0},
-	{"S_INVULN_ICON2", 0, SPR_TVIV, 2, 18, {A_Invincibility}, 0, 0, S_NULL, 0},
+	{"INVULN_ICON1", 0, SPR_TVIV, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_INVULN_ICON2, 0},
+	{"INVULN_ICON2", 0, SPR_TVIV, 2, 18, {A_Invincibility}, 0, 0, S_NULL, 0},
 
-	{"S_1UP_ICON1", 0, SPR_TV1U, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_1UP_ICON2, 0},
-	{"S_1UP_ICON2", 0, SPR_TV1U, 2, 18, {A_ExtraLife},  0, 0, S_NULL, 0},
+	{"1UP_ICON1", 0, SPR_TV1U, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_1UP_ICON2, 0},
+	{"1UP_ICON2", 0, SPR_TV1U, 2, 18, {A_ExtraLife},  0, 0, S_NULL, 0},
 
-	{"S_EGGMAN_ICON1", 0, SPR_TVEG, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_EGGMAN_ICON2, 0},
-	{"S_EGGMAN_ICON2", 0, SPR_TVEG, 2, 18, {A_EggmanBox}, 0, 0, S_NULL, 0},
+	{"EGGMAN_ICON1", 0, SPR_TVEG, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_EGGMAN_ICON2, 0},
+	{"EGGMAN_ICON2", 0, SPR_TVEG, 2, 18, {A_EggmanBox}, 0, 0, S_NULL, 0},
 
-	{"S_MIXUP_ICON1", 0, SPR_TVMX, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_MIXUP_ICON2, 0},
-	{"S_MIXUP_ICON2", 0, SPR_TVMX, 2, 18, {A_MixUp}, 0, 0, S_NULL, 0},
+	{"MIXUP_ICON1", 0, SPR_TVMX, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_MIXUP_ICON2, 0},
+	{"MIXUP_ICON2", 0, SPR_TVMX, 2, 18, {A_MixUp}, 0, 0, S_NULL, 0},
 
-	{"S_GRAVITY_ICON1", 0, SPR_TVGV, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_GRAVITY_ICON2, 0},
-	{"S_GRAVITY_ICON2", 0, SPR_TVGV, 2, 18, {A_GravityBox}, 0, 0, S_NULL, 0},
+	{"GRAVITY_ICON1", 0, SPR_TVGV, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_GRAVITY_ICON2, 0},
+	{"GRAVITY_ICON2", 0, SPR_TVGV, 2, 18, {A_GravityBox}, 0, 0, S_NULL, 0},
 
-	{"S_RECYCLER_ICON1", 0, SPR_TVRC, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_RECYCLER_ICON2, 0},
-	{"S_RECYCLER_ICON2", 0, SPR_TVRC, 2, 18, {A_RecyclePowers}, 0, 0, S_NULL, 0},
+	{"RECYCLER_ICON1", 0, SPR_TVRC, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_RECYCLER_ICON2, 0},
+	{"RECYCLER_ICON2", 0, SPR_TVRC, 2, 18, {A_RecyclePowers}, 0, 0, S_NULL, 0},
 
-	{"S_SCORE1K_ICON1", 0, SPR_TV1K, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_SCORE1K_ICON2, 0},
-	{"S_SCORE1K_ICON2", 0, SPR_TV1K, 2, 18, {A_AwardScore}, 0, 0, S_NULL, 0},
+	{"SCORE1K_ICON1", 0, SPR_TV1K, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_SCORE1K_ICON2, 0},
+	{"SCORE1K_ICON2", 0, SPR_TV1K, 2, 18, {A_AwardScore}, 0, 0, S_NULL, 0},
 
-	{"S_SCORE10K_ICON1", 0, SPR_TVTK, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_SCORE10K_ICON2, 0},
-	{"S_SCORE10K_ICON2", 0, SPR_TVTK, 2, 18, {A_AwardScore}, 0, 0, S_NULL, 0},
+	{"SCORE10K_ICON1", 0, SPR_TVTK, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_SCORE10K_ICON2, 0},
+	{"SCORE10K_ICON2", 0, SPR_TVTK, 2, 18, {A_AwardScore}, 0, 0, S_NULL, 0},
 
-	{"S_FLAMEAURA_ICON1", 0, SPR_TVFL, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_FLAMEAURA_ICON2, 0},
-	{"S_FLAMEAURA_ICON2", 0, SPR_TVFL, 2, 18, {A_GiveShield}, SH_FLAMEAURA, 0, S_NULL, 0},
+	{"FLAMEAURA_ICON1", 0, SPR_TVFL, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_FLAMEAURA_ICON2, 0},
+	{"FLAMEAURA_ICON2", 0, SPR_TVFL, 2, 18, {A_GiveShield}, SH_FLAMEAURA, 0, S_NULL, 0},
 
-	{"S_BUBBLEWRAP_ICON1", 0, SPR_TVBB, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_BUBBLEWRAP_ICON2, 0},
-	{"S_BUBBLEWRAP_ICON2", 0, SPR_TVBB, 2, 18, {A_GiveShield}, SH_BUBBLEWRAP, 0, S_NULL, 0},
+	{"BUBBLEWRAP_ICON1", 0, SPR_TVBB, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_BUBBLEWRAP_ICON2, 0},
+	{"BUBBLEWRAP_ICON2", 0, SPR_TVBB, 2, 18, {A_GiveShield}, SH_BUBBLEWRAP, 0, S_NULL, 0},
 
-	{"S_THUNDERCOIN_ICON1", 0, SPR_TVZP, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_THUNDERCOIN_ICON2, 0},
-	{"S_THUNDERCOIN_ICON2", 0, SPR_TVZP, 2, 18, {A_GiveShield}, SH_THUNDERCOIN, 0, S_NULL, 0},
+	{"THUNDERCOIN_ICON1", 0, SPR_TVZP, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_THUNDERCOIN_ICON2, 0},
+	{"THUNDERCOIN_ICON2", 0, SPR_TVZP, 2, 18, {A_GiveShield}, SH_THUNDERCOIN, 0, S_NULL, 0},
 
 	// ---
 
-	{"S_ROCKET", 0, SPR_MISL, FF_FULLBRIGHT, 1, {A_SmokeTrailer}, MT_SMOKE, 0, S_ROCKET, 0},
+	{"ROCKET", 0, SPR_MISL, FF_FULLBRIGHT, 1, {A_SmokeTrailer}, MT_SMOKE, 0, S_ROCKET, 0},
 
-	{"S_LASER", 0, SPR_LASR, FF_FULLBRIGHT|0, 2, {NULL}, 0, 0, S_NULL, 0},
-	{"S_LASER2", 0, SPR_LASR, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_NULL, 0},
-	{"S_LASERFLASH", 0, SPR_LASR, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_NULL, 0},
+	{"LASER", 0, SPR_LASR, FF_FULLBRIGHT|0, 2, {NULL}, 0, 0, S_NULL, 0},
+	{"LASER2", 0, SPR_LASR, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_NULL, 0},
+	{"LASERFLASH", 0, SPR_LASR, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_LASERFLAME1", 0, SPR_LASF,                           FF_FULLBRIGHT|0,       2,           {NULL}, 0, 0, S_LASERFLAME2, 0},
-	{"S_LASERFLAME2", 0, SPR_LASF,                           FF_FULLBRIGHT|1,       1, {A_ChangeHeight}, 156*FRACUNIT, 3, S_LASERFLAME3, 0},
-	{"S_LASERFLAME3", 0, SPR_LASF,                           FF_FULLBRIGHT|2,       0, {A_ChangeHeight}, 32*FRACUNIT, 3, S_LASERFLAME4, 0},
-	{"S_LASERFLAME4", 0, SPR_LASF, FF_ANIMATE|FF_PAPERSPRITE|FF_FULLBRIGHT|2,       4,           {NULL}, 1, 2, S_LASERFLAME5, 0},
-	{"S_LASERFLAME5", 0, SPR_LASF, FF_ANIMATE|FF_PAPERSPRITE|FF_FULLBRIGHT|4,      28,           {NULL}, 2, 2, S_NULL, 0},
+	{"LASERFLAME1", 0, SPR_LASF,                           FF_FULLBRIGHT|0,       2,           {NULL}, 0, 0, S_LASERFLAME2, 0},
+	{"LASERFLAME2", 0, SPR_LASF,                           FF_FULLBRIGHT|1,       1, {A_ChangeHeight}, 156*FRACUNIT, 3, S_LASERFLAME3, 0},
+	{"LASERFLAME3", 0, SPR_LASF,                           FF_FULLBRIGHT|2,       0, {A_ChangeHeight}, 32*FRACUNIT, 3, S_LASERFLAME4, 0},
+	{"LASERFLAME4", 0, SPR_LASF, FF_ANIMATE|FF_PAPERSPRITE|FF_FULLBRIGHT|2,       4,           {NULL}, 1, 2, S_LASERFLAME5, 0},
+	{"LASERFLAME5", 0, SPR_LASF, FF_ANIMATE|FF_PAPERSPRITE|FF_FULLBRIGHT|4,      28,           {NULL}, 2, 2, S_NULL, 0},
 
-	{"S_TORPEDO", 0, SPR_TORP, 0, 1, {A_SmokeTrailer}, MT_SMOKE, 0, S_TORPEDO, 0},
+	{"TORPEDO", 0, SPR_TORP, 0, 1, {A_SmokeTrailer}, MT_SMOKE, 0, S_TORPEDO, 0},
 
-	{"S_ENERGYBALL1", 0, SPR_ENRG, FF_FULLBRIGHT|FF_TRANS30, 1, {NULL}, 0, 0, S_ENERGYBALL2, 0},
-	{"S_ENERGYBALL2", 0, SPR_NULL, 0, 1, {NULL}, 0, 0, S_ENERGYBALL1, 0},
+	{"ENERGYBALL1", 0, SPR_ENRG, FF_FULLBRIGHT|FF_TRANS30, 1, {NULL}, 0, 0, S_ENERGYBALL2, 0},
+	{"ENERGYBALL2", 0, SPR_NULL, 0, 1, {NULL}, 0, 0, S_ENERGYBALL1, 0},
 
 	// Skim Mine (also dropped by Jetty-Syn bomber)
-	{"S_MINE1", 0, SPR_MINE, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_MINE_BOOM1", 0, SPR_MINE, 1, 1, {A_Fall}, 0, 0, S_MINE_BOOM2, 0},
-	{"S_MINE_BOOM2", 0, SPR_MINE, 2, 3, {A_Scream}, 0, 0, S_MINE_BOOM3, 0},
-	{"S_MINE_BOOM3", 0, SPR_MINE, 3, 3, {A_Explode}, 0, 0, S_MINE_BOOM4, 0},
-	{"S_MINE_BOOM4", 0, SPR_MINE, 4, 3, {NULL}, 0, 0, S_NULL, 0},
+	{"MINE1", 0, SPR_MINE, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"MINE_BOOM1", 0, SPR_MINE, 1, 1, {A_Fall}, 0, 0, S_MINE_BOOM2, 0},
+	{"MINE_BOOM2", 0, SPR_MINE, 2, 3, {A_Scream}, 0, 0, S_MINE_BOOM3, 0},
+	{"MINE_BOOM3", 0, SPR_MINE, 3, 3, {A_Explode}, 0, 0, S_MINE_BOOM4, 0},
+	{"MINE_BOOM4", 0, SPR_MINE, 4, 3, {NULL}, 0, 0, S_NULL, 0},
 
 	// Jetty-Syn Bullet
-	{"S_JETBULLET1", 0, SPR_JBUL, FF_FULLBRIGHT,   1, {NULL}, 0, 0, S_JETBULLET2, 0},
-	{"S_JETBULLET2", 0, SPR_JBUL, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_JETBULLET1, 0},
+	{"JETBULLET1", 0, SPR_JBUL, FF_FULLBRIGHT,   1, {NULL}, 0, 0, S_JETBULLET2, 0},
+	{"JETBULLET2", 0, SPR_JBUL, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_JETBULLET1, 0},
 
-	{"S_TURRETLASER", 0, SPR_TRLS, FF_FULLBRIGHT,   1, {NULL}, 0, 0, S_TURRETLASER, 0},
-	{"S_TURRETLASEREXPLODE1", 0, SPR_TRLS, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_TURRETLASEREXPLODE2, 0},
-	{"S_TURRETLASEREXPLODE2", 0, SPR_TRLS, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_NULL, 0},
+	{"TURRETLASER", 0, SPR_TRLS, FF_FULLBRIGHT,   1, {NULL}, 0, 0, S_TURRETLASER, 0},
+	{"TURRETLASEREXPLODE1", 0, SPR_TRLS, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_TURRETLASEREXPLODE2, 0},
+	{"TURRETLASEREXPLODE2", 0, SPR_TRLS, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_CANNONBALL1", 0, SPR_CBLL, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CANNONBALL1", 0, SPR_CBLL, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_ARROW", 0, SPR_AROW, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_ARROWBONK", 0, SPR_AROW, FF_ANIMATE, TICRATE, {A_ArrowBonks}, 7, 2, S_NULL, 0},
+	{"ARROW", 0, SPR_AROW, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"ARROWBONK", 0, SPR_AROW, FF_ANIMATE, TICRATE, {A_ArrowBonks}, 7, 2, S_NULL, 0},
 
-	{"S_DEMONFIRE", 0, SPR_CFIR, FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 5, 2, S_NULL, 0},
+	{"DEMONFIRE", 0, SPR_CFIR, FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 5, 2, S_NULL, 0},
 
-	{"S_LETTER", 0, SPR_LETR, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"LETTER", 0, SPR_LETR, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Tutorial scenery
-	{"S_TUTORIALLEAF1", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALLEAF2, 0},
-	{"S_TUTORIALLEAF2", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALLEAF3, 0},
-	{"S_TUTORIALLEAF3", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALLEAF4, 0},
-	{"S_TUTORIALLEAF4", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALLEAF5, 0},
-	{"S_TUTORIALLEAF5", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALLEAF6, 0},
-	{"S_TUTORIALLEAF6", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALLEAF7, 0},
-	{"S_TUTORIALLEAF7", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALLEAF8, 0},
-	{"S_TUTORIALLEAF8", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALLEAF9, 0},
-	{"S_TUTORIALLEAF9", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALLEAF10, 0},
-	{"S_TUTORIALLEAF10", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALLEAF11, 0},
-	{"S_TUTORIALLEAF11", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALLEAF12, 0},
-	{"S_TUTORIALLEAF12", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALLEAF13, 0},
-	{"S_TUTORIALLEAF13", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALLEAF14, 0},
-	{"S_TUTORIALLEAF14", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALLEAF15, 0},
-	{"S_TUTORIALLEAF15", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALLEAF16, 0},
-	{"S_TUTORIALLEAF16", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALLEAF1, 0},
-	{"S_TUTORIALFLOWER1", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWER2, 0},
-	{"S_TUTORIALFLOWER2", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWER3, 0},
-	{"S_TUTORIALFLOWER3", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWER4, 0},
-	{"S_TUTORIALFLOWER4", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWER5, 0},
-	{"S_TUTORIALFLOWER5", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWER6, 0},
-	{"S_TUTORIALFLOWER6", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWER7, 0},
-	{"S_TUTORIALFLOWER7", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWER8, 0},
-	{"S_TUTORIALFLOWER8", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWER9, 0},
-	{"S_TUTORIALFLOWER9", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWER10, 0},
-	{"S_TUTORIALFLOWER10", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWER11, 0},
-	{"S_TUTORIALFLOWER11", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWER12, 0},
-	{"S_TUTORIALFLOWER12", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWER13, 0},
-	{"S_TUTORIALFLOWER13", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWER14, 0},
-	{"S_TUTORIALFLOWER14", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWER15, 0},
-	{"S_TUTORIALFLOWER15", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWER16, 0},
-	{"S_TUTORIALFLOWER16", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWER1, 0},
-	{"S_TUTORIALFLOWERF1", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF2, 0},
-	{"S_TUTORIALFLOWERF2", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF3, 0},
-	{"S_TUTORIALFLOWERF3", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF4, 0},
-	{"S_TUTORIALFLOWERF4", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF5, 0},
-	{"S_TUTORIALFLOWERF5", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF6, 0},
-	{"S_TUTORIALFLOWERF6", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF7, 0},
-	{"S_TUTORIALFLOWERF7", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF8, 0},
-	{"S_TUTORIALFLOWERF8", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF9, 0},
-	{"S_TUTORIALFLOWERF9", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF10, 0},
-	{"S_TUTORIALFLOWERF10", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF11, 0},
-	{"S_TUTORIALFLOWERF11", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF12, 0},
-	{"S_TUTORIALFLOWERF12", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF13, 0},
-	{"S_TUTORIALFLOWERF13", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF14, 0},
-	{"S_TUTORIALFLOWERF14", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF15, 0},
-	{"S_TUTORIALFLOWERF15", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF16, 0},
-	{"S_TUTORIALFLOWERF16", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF1, 0},
+	{"TUTORIALLEAF1", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALLEAF2, 0},
+	{"TUTORIALLEAF2", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALLEAF3, 0},
+	{"TUTORIALLEAF3", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALLEAF4, 0},
+	{"TUTORIALLEAF4", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALLEAF5, 0},
+	{"TUTORIALLEAF5", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALLEAF6, 0},
+	{"TUTORIALLEAF6", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALLEAF7, 0},
+	{"TUTORIALLEAF7", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALLEAF8, 0},
+	{"TUTORIALLEAF8", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALLEAF9, 0},
+	{"TUTORIALLEAF9", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALLEAF10, 0},
+	{"TUTORIALLEAF10", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALLEAF11, 0},
+	{"TUTORIALLEAF11", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALLEAF12, 0},
+	{"TUTORIALLEAF12", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALLEAF13, 0},
+	{"TUTORIALLEAF13", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALLEAF14, 0},
+	{"TUTORIALLEAF14", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALLEAF15, 0},
+	{"TUTORIALLEAF15", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALLEAF16, 0},
+	{"TUTORIALLEAF16", 0, SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALLEAF1, 0},
+	{"TUTORIALFLOWER1", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWER2, 0},
+	{"TUTORIALFLOWER2", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWER3, 0},
+	{"TUTORIALFLOWER3", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWER4, 0},
+	{"TUTORIALFLOWER4", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWER5, 0},
+	{"TUTORIALFLOWER5", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWER6, 0},
+	{"TUTORIALFLOWER6", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWER7, 0},
+	{"TUTORIALFLOWER7", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWER8, 0},
+	{"TUTORIALFLOWER8", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWER9, 0},
+	{"TUTORIALFLOWER9", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWER10, 0},
+	{"TUTORIALFLOWER10", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWER11, 0},
+	{"TUTORIALFLOWER11", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWER12, 0},
+	{"TUTORIALFLOWER12", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWER13, 0},
+	{"TUTORIALFLOWER13", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWER14, 0},
+	{"TUTORIALFLOWER14", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWER15, 0},
+	{"TUTORIALFLOWER15", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWER16, 0},
+	{"TUTORIALFLOWER16", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWER1, 0},
+	{"TUTORIALFLOWERF1", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF2, 0},
+	{"TUTORIALFLOWERF2", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF3, 0},
+	{"TUTORIALFLOWERF3", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF4, 0},
+	{"TUTORIALFLOWERF4", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF5, 0},
+	{"TUTORIALFLOWERF5", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF6, 0},
+	{"TUTORIALFLOWERF6", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF7, 0},
+	{"TUTORIALFLOWERF7", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF8, 0},
+	{"TUTORIALFLOWERF8", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF9, 0},
+	{"TUTORIALFLOWERF9", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF10, 0},
+	{"TUTORIALFLOWERF10", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF11, 0},
+	{"TUTORIALFLOWERF11", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF12, 0},
+	{"TUTORIALFLOWERF12", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF13, 0},
+	{"TUTORIALFLOWERF13", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF14, 0},
+	{"TUTORIALFLOWERF14", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF15, 0},
+	{"TUTORIALFLOWERF15", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF16, 0},
+	{"TUTORIALFLOWERF16", 0, SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF1, 0},
 
 	// GFZ flowers
-	{"S_GFZFLOWERA", 0, SPR_FWR1, FF_ANIMATE, -1, {NULL},  7, 3, S_NULL, 0},
-	{"S_GFZFLOWERB", 0, SPR_FWR2, FF_ANIMATE, -1, {NULL}, 19, 3, S_NULL, 0},
-	{"S_GFZFLOWERC", 0, SPR_FWR3, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
+	{"GFZFLOWERA", 0, SPR_FWR1, FF_ANIMATE, -1, {NULL},  7, 3, S_NULL, 0},
+	{"GFZFLOWERB", 0, SPR_FWR2, FF_ANIMATE, -1, {NULL}, 19, 3, S_NULL, 0},
+	{"GFZFLOWERC", 0, SPR_FWR3, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
 
-	{"S_BLUEBERRYBUSH", 0, SPR_BUS3, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BERRYBUSH", 0, SPR_BUS1, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BUSH", 0, SPR_BUS2, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BLUEBERRYBUSH", 0, SPR_BUS3, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BERRYBUSH", 0, SPR_BUS1, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BUSH", 0, SPR_BUS2, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Trees
-	{"S_GFZTREE", 0, SPR_TRE1, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_GFZBERRYTREE", 0, SPR_TRE1, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_GFZCHERRYTREE", 0, SPR_TRE1, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CHECKERTREE", 0, SPR_TRE2, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CHECKERSUNSETTREE", 0, SPR_TRE2, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_FHZTREE", 0, SPR_TRE3, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_FHZPINKTREE", 0, SPR_TRE3, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_POLYGONTREE", 0, SPR_TRE4, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BUSHTREE", 0, SPR_TRE5, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BUSHREDTREE", 0, SPR_TRE5, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_SPRINGTREE", 0, SPR_TRE6, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"GFZTREE", 0, SPR_TRE1, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"GFZBERRYTREE", 0, SPR_TRE1, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"GFZCHERRYTREE", 0, SPR_TRE1, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CHECKERTREE", 0, SPR_TRE2, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CHECKERSUNSETTREE", 0, SPR_TRE2, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"FHZTREE", 0, SPR_TRE3, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"FHZPINKTREE", 0, SPR_TRE3, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"POLYGONTREE", 0, SPR_TRE4, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BUSHTREE", 0, SPR_TRE5, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BUSHREDTREE", 0, SPR_TRE5, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SPRINGTREE", 0, SPR_TRE6, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// THZ flowers
-	{"S_THZFLOWERA", 0, SPR_THZP, FF_ANIMATE, -1, {NULL},  7, 4, S_NULL, 0},
-	{"S_THZFLOWERB", 0, SPR_FWR5, FF_ANIMATE, -1, {NULL}, 19, 2, S_NULL, 0},
-	{"S_THZFLOWERC", 0, SPR_FWR6, FF_ANIMATE, -1, {NULL}, 19, 2, S_NULL, 0},
+	{"THZFLOWERA", 0, SPR_THZP, FF_ANIMATE, -1, {NULL},  7, 4, S_NULL, 0},
+	{"THZFLOWERB", 0, SPR_FWR5, FF_ANIMATE, -1, {NULL}, 19, 2, S_NULL, 0},
+	{"THZFLOWERC", 0, SPR_FWR6, FF_ANIMATE, -1, {NULL}, 19, 2, S_NULL, 0},
 
 	// THZ Steam Whistle tree/bush
-	{"S_THZTREE", 0, SPR_THZT, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_THZTREEBRANCH1", 0, SPR_THZT,  1|FF_PAPERSPRITE, 40, {NULL}, 0, 0, S_THZTREEBRANCH2, 0},
-	{"S_THZTREEBRANCH2", 0, SPR_THZT,  2|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH3, 0},
-	{"S_THZTREEBRANCH3", 0, SPR_THZT,  3|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH4, 0},
-	{"S_THZTREEBRANCH4", 0, SPR_THZT,  4|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH5, 0},
-	{"S_THZTREEBRANCH5", 0, SPR_THZT,  5|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH6, 0},
-	{"S_THZTREEBRANCH6", 0, SPR_THZT,  6|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH7, 0},
-	{"S_THZTREEBRANCH7", 0, SPR_THZT,  7|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH8, 0},
-	{"S_THZTREEBRANCH8", 0, SPR_THZT,  8|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH9, 0},
-	{"S_THZTREEBRANCH9", 0, SPR_THZT,  9|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH10, 0},
-	{"S_THZTREEBRANCH10", 0, SPR_THZT, 10|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH11, 0},
-	{"S_THZTREEBRANCH11", 0, SPR_THZT, 11|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH12, 0},
-	{"S_THZTREEBRANCH12", 0, SPR_THZT, 12|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH13, 0},
-	{"S_THZTREEBRANCH13", 0, SPR_THZT, 13|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH1, 0},
+	{"THZTREE", 0, SPR_THZT, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"THZTREEBRANCH1", 0, SPR_THZT,  1|FF_PAPERSPRITE, 40, {NULL}, 0, 0, S_THZTREEBRANCH2, 0},
+	{"THZTREEBRANCH2", 0, SPR_THZT,  2|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH3, 0},
+	{"THZTREEBRANCH3", 0, SPR_THZT,  3|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH4, 0},
+	{"THZTREEBRANCH4", 0, SPR_THZT,  4|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH5, 0},
+	{"THZTREEBRANCH5", 0, SPR_THZT,  5|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH6, 0},
+	{"THZTREEBRANCH6", 0, SPR_THZT,  6|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH7, 0},
+	{"THZTREEBRANCH7", 0, SPR_THZT,  7|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH8, 0},
+	{"THZTREEBRANCH8", 0, SPR_THZT,  8|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH9, 0},
+	{"THZTREEBRANCH9", 0, SPR_THZT,  9|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH10, 0},
+	{"THZTREEBRANCH10", 0, SPR_THZT, 10|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH11, 0},
+	{"THZTREEBRANCH11", 0, SPR_THZT, 11|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH12, 0},
+	{"THZTREEBRANCH12", 0, SPR_THZT, 12|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH13, 0},
+	{"THZTREEBRANCH13", 0, SPR_THZT, 13|FF_PAPERSPRITE,  4, {NULL}, 0, 0, S_THZTREEBRANCH1, 0},
 
 	// THZ Alarm
-	{"S_ALARM1", 0, SPR_ALRM, FF_FULLBRIGHT, 35, {A_Scream}, 0, 0, S_ALARM1, 0},
+	{"ALARM1", 0, SPR_ALRM, FF_FULLBRIGHT, 35, {A_Scream}, 0, 0, S_ALARM1, 0},
 
 	// Deep Sea Gargoyle
-	{"S_GARGOYLE", 0, SPR_GARG, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BIGGARGOYLE", 0, SPR_GARG, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"GARGOYLE", 0, SPR_GARG, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BIGGARGOYLE", 0, SPR_GARG, 1, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// DSZ Seaweed
-	{"S_SEAWEED1", 0, SPR_SEWE, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 26, 3, S_SEAWEED1, 0},
-	{"S_SEAWEED2", 0, SPR_SEWE, 1, 5, {NULL}, 0, 0, S_SEAWEED3, 0},
-	{"S_SEAWEED3", 0, SPR_SEWE, 2, 5, {NULL}, 0, 0, S_SEAWEED4, 0},
-	{"S_SEAWEED4", 0, SPR_SEWE, 3, 5, {NULL}, 0, 0, S_SEAWEED5, 0},
-	{"S_SEAWEED5", 0, SPR_SEWE, 4, 5, {NULL}, 0, 0, S_SEAWEED6, 0},
-	{"S_SEAWEED6", 0, SPR_SEWE, 5, 5, {NULL}, 0, 0, S_SEAWEED1, 0},
+	{"SEAWEED1", 0, SPR_SEWE, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 26, 3, S_SEAWEED1, 0},
+	{"SEAWEED2", 0, SPR_SEWE, 1, 5, {NULL}, 0, 0, S_SEAWEED3, 0},
+	{"SEAWEED3", 0, SPR_SEWE, 2, 5, {NULL}, 0, 0, S_SEAWEED4, 0},
+	{"SEAWEED4", 0, SPR_SEWE, 3, 5, {NULL}, 0, 0, S_SEAWEED5, 0},
+	{"SEAWEED5", 0, SPR_SEWE, 4, 5, {NULL}, 0, 0, S_SEAWEED6, 0},
+	{"SEAWEED6", 0, SPR_SEWE, 5, 5, {NULL}, 0, 0, S_SEAWEED1, 0},
 
 	// Dripping water
-	{"S_DRIPA1", 0, SPR_NULL, FF_TRANS30  , 3*TICRATE, {NULL},                  0, 0, S_DRIPA2, 0},
-	{"S_DRIPA2", 0, SPR_DRIP, FF_TRANS30  ,         2, {NULL},                  0, 0, S_DRIPA3, 0},
-	{"S_DRIPA3", 0, SPR_DRIP, FF_TRANS30|1,         2, {NULL},                  0, 0, S_DRIPA4, 0},
-	{"S_DRIPA4", 0, SPR_DRIP, FF_TRANS30|2,         2, {A_SpawnObjectRelative}, 0, MT_WATERDROP, S_DRIPA1, 0},
-	{"S_DRIPB1", 0, SPR_DRIP, FF_TRANS30|3,        -1, {NULL},                  0, 0, S_DRIPB1, 0},
-	{"S_DRIPC1", 0, SPR_DRIP, FF_TRANS30|4,         1, {NULL},                  0, 0, S_DRIPC2, 0},
-	{"S_DRIPC2", 0, SPR_DRIP, FF_TRANS30|5,         1, {NULL},                  0, 0,   S_NULL, 0},
+	{"DRIPA1", 0, SPR_NULL, FF_TRANS30  , 3*TICRATE, {NULL},                  0, 0, S_DRIPA2, 0},
+	{"DRIPA2", 0, SPR_DRIP, FF_TRANS30  ,         2, {NULL},                  0, 0, S_DRIPA3, 0},
+	{"DRIPA3", 0, SPR_DRIP, FF_TRANS30|1,         2, {NULL},                  0, 0, S_DRIPA4, 0},
+	{"DRIPA4", 0, SPR_DRIP, FF_TRANS30|2,         2, {A_SpawnObjectRelative}, 0, MT_WATERDROP, S_DRIPA1, 0},
+	{"DRIPB1", 0, SPR_DRIP, FF_TRANS30|3,        -1, {NULL},                  0, 0, S_DRIPB1, 0},
+	{"DRIPC1", 0, SPR_DRIP, FF_TRANS30|4,         1, {NULL},                  0, 0, S_DRIPC2, 0},
+	{"DRIPC2", 0, SPR_DRIP, FF_TRANS30|5,         1, {NULL},                  0, 0,   S_NULL, 0},
 
 	// Coral
-	{"S_CORAL1", 0, SPR_CORL, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CORAL2", 0, SPR_CORL, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CORAL3", 0, SPR_CORL, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CORAL4", 0, SPR_CORL, 3, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CORAL5", 0, SPR_CORL, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CORAL1", 0, SPR_CORL, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CORAL2", 0, SPR_CORL, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CORAL3", 0, SPR_CORL, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CORAL4", 0, SPR_CORL, 3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CORAL5", 0, SPR_CORL, 4, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Blue Crystal
-	{"S_BLUECRYSTAL1", 0, SPR_BCRY, FF_TRANS30, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BLUECRYSTAL1", 0, SPR_BCRY, FF_TRANS30, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Kelp
-	{"S_KELP", 0, SPR_KELP, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"KELP", 0, SPR_KELP, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Animated algae
-	{"S_ANIMALGAETOP1", 0, SPR_ALGA, 0, 1, {A_ConnectToGround}, MT_ANIMALGAESEG, 0, S_ANIMALGAETOP2, 0},
-	{"S_ANIMALGAETOP2", 0, SPR_ALGA, 0|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 11, 4, S_NULL, 0},
-	{"S_ANIMALGAESEG", 0, SPR_ALGB, 0|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 11, 4, S_NULL, 0},
+	{"ANIMALGAETOP1", 0, SPR_ALGA, 0, 1, {A_ConnectToGround}, MT_ANIMALGAESEG, 0, S_ANIMALGAETOP2, 0},
+	{"ANIMALGAETOP2", 0, SPR_ALGA, 0|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 11, 4, S_NULL, 0},
+	{"ANIMALGAESEG", 0, SPR_ALGB, 0|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 11, 4, S_NULL, 0},
 
 	// DSZ Stalagmites
-	{"S_DSZSTALAGMITE", 0, SPR_DSTG, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_DSZ2STALAGMITE", 0, SPR_DSTG, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"DSZSTALAGMITE", 0, SPR_DSTG, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"DSZ2STALAGMITE", 0, SPR_DSTG, 1, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// DSZ Light beam
-	{"S_LIGHTBEAM1", 0, SPR_LIBE, 0|FF_TRANS80|FF_FULLBRIGHT|FF_PAPERSPRITE, 4, {A_LightBeamReset}, 0, 0, S_LIGHTBEAM2, 0},
-	{"S_LIGHTBEAM2", 0, SPR_LIBE, 0|FF_TRANS70|FF_FULLBRIGHT|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_LIGHTBEAM3, 0},
-	{"S_LIGHTBEAM3", 0, SPR_LIBE, 0|FF_TRANS60|FF_FULLBRIGHT|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_LIGHTBEAM4, 0},
-	{"S_LIGHTBEAM4", 0, SPR_LIBE, 0|FF_TRANS50|FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {NULL}, 0, 0, S_LIGHTBEAM5, 0},
-	{"S_LIGHTBEAM5", 0, SPR_LIBE, 0|FF_TRANS40|FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {NULL}, 0, 0, S_LIGHTBEAM6, 0},
-	{"S_LIGHTBEAM6", 0, SPR_LIBE, 0|FF_TRANS30|FF_FULLBRIGHT|FF_PAPERSPRITE, 9, {NULL}, 0, 0, S_LIGHTBEAM7, 0},
-	{"S_LIGHTBEAM7", 0, SPR_LIBE, 0|FF_TRANS40|FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {NULL}, 0, 0, S_LIGHTBEAM8, 0},
-	{"S_LIGHTBEAM8", 0, SPR_LIBE, 0|FF_TRANS50|FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {NULL}, 0, 0, S_LIGHTBEAM9, 0},
-	{"S_LIGHTBEAM9", 0, SPR_LIBE, 0|FF_TRANS60|FF_FULLBRIGHT|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_LIGHTBEAM10, 0},
-	{"S_LIGHTBEAM10", 0, SPR_LIBE, 0|FF_TRANS70|FF_FULLBRIGHT|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_LIGHTBEAM11, 0},
-	{"S_LIGHTBEAM11", 0, SPR_LIBE, 0|FF_TRANS80|FF_FULLBRIGHT|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_LIGHTBEAM12, 0},
-	{"S_LIGHTBEAM12", 0, SPR_NULL, 0, 2, {A_SetRandomTics}, 4, 35, S_LIGHTBEAM1, 0},
+	{"LIGHTBEAM1", 0, SPR_LIBE, 0|FF_TRANS80|FF_FULLBRIGHT|FF_PAPERSPRITE, 4, {A_LightBeamReset}, 0, 0, S_LIGHTBEAM2, 0},
+	{"LIGHTBEAM2", 0, SPR_LIBE, 0|FF_TRANS70|FF_FULLBRIGHT|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_LIGHTBEAM3, 0},
+	{"LIGHTBEAM3", 0, SPR_LIBE, 0|FF_TRANS60|FF_FULLBRIGHT|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_LIGHTBEAM4, 0},
+	{"LIGHTBEAM4", 0, SPR_LIBE, 0|FF_TRANS50|FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {NULL}, 0, 0, S_LIGHTBEAM5, 0},
+	{"LIGHTBEAM5", 0, SPR_LIBE, 0|FF_TRANS40|FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {NULL}, 0, 0, S_LIGHTBEAM6, 0},
+	{"LIGHTBEAM6", 0, SPR_LIBE, 0|FF_TRANS30|FF_FULLBRIGHT|FF_PAPERSPRITE, 9, {NULL}, 0, 0, S_LIGHTBEAM7, 0},
+	{"LIGHTBEAM7", 0, SPR_LIBE, 0|FF_TRANS40|FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {NULL}, 0, 0, S_LIGHTBEAM8, 0},
+	{"LIGHTBEAM8", 0, SPR_LIBE, 0|FF_TRANS50|FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {NULL}, 0, 0, S_LIGHTBEAM9, 0},
+	{"LIGHTBEAM9", 0, SPR_LIBE, 0|FF_TRANS60|FF_FULLBRIGHT|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_LIGHTBEAM10, 0},
+	{"LIGHTBEAM10", 0, SPR_LIBE, 0|FF_TRANS70|FF_FULLBRIGHT|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_LIGHTBEAM11, 0},
+	{"LIGHTBEAM11", 0, SPR_LIBE, 0|FF_TRANS80|FF_FULLBRIGHT|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_LIGHTBEAM12, 0},
+	{"LIGHTBEAM12", 0, SPR_NULL, 0, 2, {A_SetRandomTics}, 4, 35, S_LIGHTBEAM1, 0},
 
 	// CEZ Chain
-	{"S_CEZCHAIN", 0, SPR_CHAN, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEZCHAIN", 0, SPR_CHAN, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Flame
-	{"S_FLAME", 0, SPR_FLAM, FF_FULLBRIGHT|FF_ANIMATE,       3*8, {A_FlameParticle}, 7, 3, S_FLAME, 0},
-	{"S_FLAMEPARTICLE", 0, SPR_FLAM, FF_FULLBRIGHT|FF_ANIMATE|8, TICRATE,            {NULL}, 3, 3, S_NULL, 0},
-	{"S_FLAMEREST", 0, SPR_FLAM, FF_FULLBRIGHT|FF_ANIMATE,        -1,            {NULL}, 7, 3, S_NULL, 0},
+	{"FLAME", 0, SPR_FLAM, FF_FULLBRIGHT|FF_ANIMATE,       3*8, {A_FlameParticle}, 7, 3, S_FLAME, 0},
+	{"FLAMEPARTICLE", 0, SPR_FLAM, FF_FULLBRIGHT|FF_ANIMATE|8, TICRATE,            {NULL}, 3, 3, S_NULL, 0},
+	{"FLAMEREST", 0, SPR_FLAM, FF_FULLBRIGHT|FF_ANIMATE,        -1,            {NULL}, 7, 3, S_NULL, 0},
 
 	// Eggman statue
-	{"S_EGGSTATUE1", 0, SPR_ESTA, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EGGSTATUE1", 0, SPR_ESTA, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Hidden sling appears
-	{"S_SLING1", 0, SPR_NULL, 0, -1, {NULL},          0, 0, S_SLING2, 0},
-	{"S_SLING2", 0, SPR_NULL, 0, -1, {A_SlingAppear}, 0, 0, S_NULL, 0},
+	{"SLING1", 0, SPR_NULL, 0, -1, {NULL},          0, 0, S_SLING2, 0},
+	{"SLING2", 0, SPR_NULL, 0, -1, {A_SlingAppear}, 0, 0, S_NULL, 0},
 
 	// CEZ maces and chains
-	{"S_SMALLMACECHAIN", 0, SPR_SMCH, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BIGMACECHAIN", 0, SPR_BMCH, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_SMALLMACE", 0, SPR_SMCE, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BIGMACE", 0, SPR_BMCE, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_SMALLGRABCHAIN", 0, SPR_SMCH, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BIGGRABCHAIN", 0, SPR_BMCH, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SMALLMACECHAIN", 0, SPR_SMCH, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BIGMACECHAIN", 0, SPR_BMCH, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SMALLMACE", 0, SPR_SMCE, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BIGMACE", 0, SPR_BMCE, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SMALLGRABCHAIN", 0, SPR_SMCH, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BIGGRABCHAIN", 0, SPR_BMCH, 1, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Blue spring on a ball
-	{"S_BLUESPRINGBALL", 0, SPR_BSPB, 0, -1, {NULL},   0, 0, S_NULL, 0},
-	{"S_BLUESPRINGBALL2", 0, SPR_BSPB, 4,  4, {A_Pain}, 0, 0, S_BLUESPRINGBALL3, 0},
-	{"S_BLUESPRINGBALL3", 0, SPR_BSPB, 3,  1, {NULL},   0, 0, S_BLUESPRINGBALL4, 0},
-	{"S_BLUESPRINGBALL4", 0, SPR_BSPB, 2,  1, {NULL},   0, 0, S_BLUESPRINGBALL5, 0},
-	{"S_BLUESPRINGBALL5", 0, SPR_BSPB, 1,  1, {NULL},   0, 0, S_BLUESPRINGBALL, 0},
+	{"BLUESPRINGBALL", 0, SPR_BSPB, 0, -1, {NULL},   0, 0, S_NULL, 0},
+	{"BLUESPRINGBALL2", 0, SPR_BSPB, 4,  4, {A_Pain}, 0, 0, S_BLUESPRINGBALL3, 0},
+	{"BLUESPRINGBALL3", 0, SPR_BSPB, 3,  1, {NULL},   0, 0, S_BLUESPRINGBALL4, 0},
+	{"BLUESPRINGBALL4", 0, SPR_BSPB, 2,  1, {NULL},   0, 0, S_BLUESPRINGBALL5, 0},
+	{"BLUESPRINGBALL5", 0, SPR_BSPB, 1,  1, {NULL},   0, 0, S_BLUESPRINGBALL, 0},
 
 	// Yellow spring on a ball
-	{"S_YELLOWSPRINGBALL", 0, SPR_YSPB, 0, -1, {NULL},   0, 0, S_NULL, 0},
-	{"S_YELLOWSPRINGBALL2", 0, SPR_YSPB, 4,  4, {A_Pain}, 0, 0, S_YELLOWSPRINGBALL3, 0},
-	{"S_YELLOWSPRINGBALL3", 0, SPR_YSPB, 3,  1, {NULL},   0, 0, S_YELLOWSPRINGBALL4, 0},
-	{"S_YELLOWSPRINGBALL4", 0, SPR_YSPB, 2,  1, {NULL},   0, 0, S_YELLOWSPRINGBALL5, 0},
-	{"S_YELLOWSPRINGBALL5", 0, SPR_YSPB, 1,  1, {NULL},   0, 0, S_YELLOWSPRINGBALL, 0},
+	{"YELLOWSPRINGBALL", 0, SPR_YSPB, 0, -1, {NULL},   0, 0, S_NULL, 0},
+	{"YELLOWSPRINGBALL2", 0, SPR_YSPB, 4,  4, {A_Pain}, 0, 0, S_YELLOWSPRINGBALL3, 0},
+	{"YELLOWSPRINGBALL3", 0, SPR_YSPB, 3,  1, {NULL},   0, 0, S_YELLOWSPRINGBALL4, 0},
+	{"YELLOWSPRINGBALL4", 0, SPR_YSPB, 2,  1, {NULL},   0, 0, S_YELLOWSPRINGBALL5, 0},
+	{"YELLOWSPRINGBALL5", 0, SPR_YSPB, 1,  1, {NULL},   0, 0, S_YELLOWSPRINGBALL, 0},
 
 	// Red spring on a ball
-	{"S_REDSPRINGBALL", 0, SPR_RSPB, 0, -1, {NULL},   0, 0, S_NULL, 0},
-	{"S_REDSPRINGBALL2", 0, SPR_RSPB, 4,  4, {A_Pain}, 0, 0, S_REDSPRINGBALL3, 0},
-	{"S_REDSPRINGBALL3", 0, SPR_RSPB, 3,  1, {NULL},   0, 0, S_REDSPRINGBALL4, 0},
-	{"S_REDSPRINGBALL4", 0, SPR_RSPB, 2,  1, {NULL},   0, 0, S_REDSPRINGBALL5, 0},
-	{"S_REDSPRINGBALL5", 0, SPR_RSPB, 1,  1, {NULL},   0, 0, S_REDSPRINGBALL, 0},
+	{"REDSPRINGBALL", 0, SPR_RSPB, 0, -1, {NULL},   0, 0, S_NULL, 0},
+	{"REDSPRINGBALL2", 0, SPR_RSPB, 4,  4, {A_Pain}, 0, 0, S_REDSPRINGBALL3, 0},
+	{"REDSPRINGBALL3", 0, SPR_RSPB, 3,  1, {NULL},   0, 0, S_REDSPRINGBALL4, 0},
+	{"REDSPRINGBALL4", 0, SPR_RSPB, 2,  1, {NULL},   0, 0, S_REDSPRINGBALL5, 0},
+	{"REDSPRINGBALL5", 0, SPR_RSPB, 1,  1, {NULL},   0, 0, S_REDSPRINGBALL, 0},
 
 	// Small Firebar
-	{"S_SMALLFIREBAR1", 0, SPR_SFBR, FF_FULLBRIGHT,     1, {NULL},            0, 0, S_SMALLFIREBAR2, 0},
-	{"S_SMALLFIREBAR2", 0, SPR_SFBR, FF_FULLBRIGHT| 1,  1, {NULL},            0, 0, S_SMALLFIREBAR3, 0},
-	{"S_SMALLFIREBAR3", 0, SPR_SFBR, FF_FULLBRIGHT| 2,  1, {A_FlameParticle}, 0, 0, S_SMALLFIREBAR4, 0},
-	{"S_SMALLFIREBAR4", 0, SPR_SFBR, FF_FULLBRIGHT| 3,  1, {NULL},            0, 0, S_SMALLFIREBAR5, 0},
-	{"S_SMALLFIREBAR5", 0, SPR_SFBR, FF_FULLBRIGHT| 4,  1, {NULL},            0, 0, S_SMALLFIREBAR6, 0},
-	{"S_SMALLFIREBAR6", 0, SPR_SFBR, FF_FULLBRIGHT| 5,  1, {NULL},            0, 0, S_SMALLFIREBAR7, 0},
-	{"S_SMALLFIREBAR7", 0, SPR_SFBR, FF_FULLBRIGHT| 6,  1, {A_FlameParticle}, 0, 0, S_SMALLFIREBAR8, 0},
-	{"S_SMALLFIREBAR8", 0, SPR_SFBR, FF_FULLBRIGHT| 7,  1, {NULL},            0, 0, S_SMALLFIREBAR9, 0},
-	{"S_SMALLFIREBAR9", 0, SPR_SFBR, FF_FULLBRIGHT| 8,  1, {NULL},            0, 0, S_SMALLFIREBAR10, 0},
-	{"S_SMALLFIREBAR10", 0, SPR_SFBR, FF_FULLBRIGHT| 9,  1, {NULL},            0, 0, S_SMALLFIREBAR11, 0},
-	{"S_SMALLFIREBAR11", 0, SPR_SFBR, FF_FULLBRIGHT|10,  1, {A_FlameParticle}, 0, 0, S_SMALLFIREBAR12, 0},
-	{"S_SMALLFIREBAR12", 0, SPR_SFBR, FF_FULLBRIGHT|11,  1, {NULL},            0, 0, S_SMALLFIREBAR13, 0},
-	{"S_SMALLFIREBAR13", 0, SPR_SFBR, FF_FULLBRIGHT|12,  1, {NULL},            0, 0, S_SMALLFIREBAR14, 0},
-	{"S_SMALLFIREBAR14", 0, SPR_SFBR, FF_FULLBRIGHT|13,  1, {NULL},            0, 0, S_SMALLFIREBAR15, 0},
-	{"S_SMALLFIREBAR15", 0, SPR_SFBR, FF_FULLBRIGHT|14,  1, {A_FlameParticle}, 0, 0, S_SMALLFIREBAR16, 0},
-	{"S_SMALLFIREBAR16", 0, SPR_SFBR, FF_FULLBRIGHT|15,  1, {NULL},            0, 0, S_SMALLFIREBAR1, 0},
+	{"SMALLFIREBAR1", 0, SPR_SFBR, FF_FULLBRIGHT,     1, {NULL},            0, 0, S_SMALLFIREBAR2, 0},
+	{"SMALLFIREBAR2", 0, SPR_SFBR, FF_FULLBRIGHT| 1,  1, {NULL},            0, 0, S_SMALLFIREBAR3, 0},
+	{"SMALLFIREBAR3", 0, SPR_SFBR, FF_FULLBRIGHT| 2,  1, {A_FlameParticle}, 0, 0, S_SMALLFIREBAR4, 0},
+	{"SMALLFIREBAR4", 0, SPR_SFBR, FF_FULLBRIGHT| 3,  1, {NULL},            0, 0, S_SMALLFIREBAR5, 0},
+	{"SMALLFIREBAR5", 0, SPR_SFBR, FF_FULLBRIGHT| 4,  1, {NULL},            0, 0, S_SMALLFIREBAR6, 0},
+	{"SMALLFIREBAR6", 0, SPR_SFBR, FF_FULLBRIGHT| 5,  1, {NULL},            0, 0, S_SMALLFIREBAR7, 0},
+	{"SMALLFIREBAR7", 0, SPR_SFBR, FF_FULLBRIGHT| 6,  1, {A_FlameParticle}, 0, 0, S_SMALLFIREBAR8, 0},
+	{"SMALLFIREBAR8", 0, SPR_SFBR, FF_FULLBRIGHT| 7,  1, {NULL},            0, 0, S_SMALLFIREBAR9, 0},
+	{"SMALLFIREBAR9", 0, SPR_SFBR, FF_FULLBRIGHT| 8,  1, {NULL},            0, 0, S_SMALLFIREBAR10, 0},
+	{"SMALLFIREBAR10", 0, SPR_SFBR, FF_FULLBRIGHT| 9,  1, {NULL},            0, 0, S_SMALLFIREBAR11, 0},
+	{"SMALLFIREBAR11", 0, SPR_SFBR, FF_FULLBRIGHT|10,  1, {A_FlameParticle}, 0, 0, S_SMALLFIREBAR12, 0},
+	{"SMALLFIREBAR12", 0, SPR_SFBR, FF_FULLBRIGHT|11,  1, {NULL},            0, 0, S_SMALLFIREBAR13, 0},
+	{"SMALLFIREBAR13", 0, SPR_SFBR, FF_FULLBRIGHT|12,  1, {NULL},            0, 0, S_SMALLFIREBAR14, 0},
+	{"SMALLFIREBAR14", 0, SPR_SFBR, FF_FULLBRIGHT|13,  1, {NULL},            0, 0, S_SMALLFIREBAR15, 0},
+	{"SMALLFIREBAR15", 0, SPR_SFBR, FF_FULLBRIGHT|14,  1, {A_FlameParticle}, 0, 0, S_SMALLFIREBAR16, 0},
+	{"SMALLFIREBAR16", 0, SPR_SFBR, FF_FULLBRIGHT|15,  1, {NULL},            0, 0, S_SMALLFIREBAR1, 0},
 
 	// Big Firebar
-	{"S_BIGFIREBAR1", 0, SPR_BFBR, FF_FULLBRIGHT,     1, {NULL},            0, 0, S_BIGFIREBAR2, 0},
-	{"S_BIGFIREBAR2", 0, SPR_BFBR, FF_FULLBRIGHT| 1,  1, {NULL},            0, 0, S_BIGFIREBAR3, 0},
-	{"S_BIGFIREBAR3", 0, SPR_BFBR, FF_FULLBRIGHT| 2,  1, {A_FlameParticle}, 0, 0, S_BIGFIREBAR4, 0},
-	{"S_BIGFIREBAR4", 0, SPR_BFBR, FF_FULLBRIGHT| 3,  1, {NULL},            0, 0, S_BIGFIREBAR5, 0},
-	{"S_BIGFIREBAR5", 0, SPR_BFBR, FF_FULLBRIGHT| 4,  1, {NULL},            0, 0, S_BIGFIREBAR6, 0},
-	{"S_BIGFIREBAR6", 0, SPR_BFBR, FF_FULLBRIGHT| 5,  1, {NULL},            0, 0, S_BIGFIREBAR7, 0},
-	{"S_BIGFIREBAR7", 0, SPR_BFBR, FF_FULLBRIGHT| 6,  1, {A_FlameParticle}, 0, 0, S_BIGFIREBAR8, 0},
-	{"S_BIGFIREBAR8", 0, SPR_BFBR, FF_FULLBRIGHT| 7,  1, {NULL},            0, 0, S_BIGFIREBAR9, 0},
-	{"S_BIGFIREBAR9", 0, SPR_BFBR, FF_FULLBRIGHT| 8,  1, {NULL},            0, 0, S_BIGFIREBAR10, 0},
-	{"S_BIGFIREBAR10", 0, SPR_BFBR, FF_FULLBRIGHT| 9,  1, {NULL},            0, 0, S_BIGFIREBAR11, 0},
-	{"S_BIGFIREBAR11", 0, SPR_BFBR, FF_FULLBRIGHT|10,  1, {A_FlameParticle}, 0, 0, S_BIGFIREBAR12, 0},
-	{"S_BIGFIREBAR12", 0, SPR_BFBR, FF_FULLBRIGHT|11,  1, {NULL},            0, 0, S_BIGFIREBAR13, 0},
-	{"S_BIGFIREBAR13", 0, SPR_BFBR, FF_FULLBRIGHT|12,  1, {NULL},            0, 0, S_BIGFIREBAR14, 0},
-	{"S_BIGFIREBAR14", 0, SPR_BFBR, FF_FULLBRIGHT|13,  1, {NULL},            0, 0, S_BIGFIREBAR15, 0},
-	{"S_BIGFIREBAR15", 0, SPR_BFBR, FF_FULLBRIGHT|14,  1, {A_FlameParticle}, 0, 0, S_BIGFIREBAR16, 0},
-	{"S_BIGFIREBAR16", 0, SPR_BFBR, FF_FULLBRIGHT|15,  1, {NULL},            0, 0, S_BIGFIREBAR1, 0},
+	{"BIGFIREBAR1", 0, SPR_BFBR, FF_FULLBRIGHT,     1, {NULL},            0, 0, S_BIGFIREBAR2, 0},
+	{"BIGFIREBAR2", 0, SPR_BFBR, FF_FULLBRIGHT| 1,  1, {NULL},            0, 0, S_BIGFIREBAR3, 0},
+	{"BIGFIREBAR3", 0, SPR_BFBR, FF_FULLBRIGHT| 2,  1, {A_FlameParticle}, 0, 0, S_BIGFIREBAR4, 0},
+	{"BIGFIREBAR4", 0, SPR_BFBR, FF_FULLBRIGHT| 3,  1, {NULL},            0, 0, S_BIGFIREBAR5, 0},
+	{"BIGFIREBAR5", 0, SPR_BFBR, FF_FULLBRIGHT| 4,  1, {NULL},            0, 0, S_BIGFIREBAR6, 0},
+	{"BIGFIREBAR6", 0, SPR_BFBR, FF_FULLBRIGHT| 5,  1, {NULL},            0, 0, S_BIGFIREBAR7, 0},
+	{"BIGFIREBAR7", 0, SPR_BFBR, FF_FULLBRIGHT| 6,  1, {A_FlameParticle}, 0, 0, S_BIGFIREBAR8, 0},
+	{"BIGFIREBAR8", 0, SPR_BFBR, FF_FULLBRIGHT| 7,  1, {NULL},            0, 0, S_BIGFIREBAR9, 0},
+	{"BIGFIREBAR9", 0, SPR_BFBR, FF_FULLBRIGHT| 8,  1, {NULL},            0, 0, S_BIGFIREBAR10, 0},
+	{"BIGFIREBAR10", 0, SPR_BFBR, FF_FULLBRIGHT| 9,  1, {NULL},            0, 0, S_BIGFIREBAR11, 0},
+	{"BIGFIREBAR11", 0, SPR_BFBR, FF_FULLBRIGHT|10,  1, {A_FlameParticle}, 0, 0, S_BIGFIREBAR12, 0},
+	{"BIGFIREBAR12", 0, SPR_BFBR, FF_FULLBRIGHT|11,  1, {NULL},            0, 0, S_BIGFIREBAR13, 0},
+	{"BIGFIREBAR13", 0, SPR_BFBR, FF_FULLBRIGHT|12,  1, {NULL},            0, 0, S_BIGFIREBAR14, 0},
+	{"BIGFIREBAR14", 0, SPR_BFBR, FF_FULLBRIGHT|13,  1, {NULL},            0, 0, S_BIGFIREBAR15, 0},
+	{"BIGFIREBAR15", 0, SPR_BFBR, FF_FULLBRIGHT|14,  1, {A_FlameParticle}, 0, 0, S_BIGFIREBAR16, 0},
+	{"BIGFIREBAR16", 0, SPR_BFBR, FF_FULLBRIGHT|15,  1, {NULL},            0, 0, S_BIGFIREBAR1, 0},
 
-	{"S_CEZFLOWER", 0, SPR_FWR4, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CEZPOLE", 0, SPR_BANR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEZFLOWER", 0, SPR_FWR4, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEZPOLE", 0, SPR_BANR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_CEZBANNER1", 0, SPR_BANR, FF_PAPERSPRITE|1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CEZBANNER2", 0, SPR_BANR, FF_PAPERSPRITE|2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEZBANNER1", 0, SPR_BANR, FF_PAPERSPRITE|1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEZBANNER2", 0, SPR_BANR, FF_PAPERSPRITE|2, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_PINETREE", 0, SPR_PINE, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CEZBUSH1", 0, SPR_CEZB, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CEZBUSH2", 0, SPR_CEZB, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"PINETREE", 0, SPR_PINE, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEZBUSH1", 0, SPR_CEZB, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CEZBUSH2", 0, SPR_CEZB, 1, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_CANDLE", 0, SPR_CNDL, FF_FULLBRIGHT,   -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CANDLEPRICKET", 0, SPR_CNDL, FF_FULLBRIGHT|1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CANDLE", 0, SPR_CNDL, FF_FULLBRIGHT,   -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CANDLEPRICKET", 0, SPR_CNDL, FF_FULLBRIGHT|1, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_FLAMEHOLDER", 0, SPR_FLMH, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"FLAMEHOLDER", 0, SPR_FLMH, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_FIRETORCH", 0, SPR_CTRC, FF_FULLBRIGHT|FF_ANIMATE, 8*3, {A_FlameParticle}, 3, 3, S_FIRETORCH, 0},
+	{"FIRETORCH", 0, SPR_CTRC, FF_FULLBRIGHT|FF_ANIMATE, 8*3, {A_FlameParticle}, 3, 3, S_FIRETORCH, 0},
 
-	{"S_WAVINGFLAG", 0, SPR_CFLG,                0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_WAVINGFLAGSEG1", 0, SPR_CFLG, FF_PAPERSPRITE|1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_WAVINGFLAGSEG2", 0, SPR_CFLG, FF_PAPERSPRITE|2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"WAVINGFLAG", 0, SPR_CFLG,                0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"WAVINGFLAGSEG1", 0, SPR_CFLG, FF_PAPERSPRITE|1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"WAVINGFLAGSEG2", 0, SPR_CFLG, FF_PAPERSPRITE|2, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_CRAWLASTATUE", 0, SPR_CSTA, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CRAWLASTATUE", 0, SPR_CSTA, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_FACESTABBERSTATUE", 0, SPR_CBBS, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"FACESTABBERSTATUE", 0, SPR_CBBS, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_SUSPICIOUSFACESTABBERSTATUE_WAIT", 0, SPR_CBBS, 0, 5, {A_Look}, 768*FRACUNIT, 0, S_SUSPICIOUSFACESTABBERSTATUE_WAIT, 0},
-	{"S_SUSPICIOUSFACESTABBERSTATUE_BURST1", 0, SPR_CBBS, FF_ANIMATE, 23, {NULL},    6, 1, S_SUSPICIOUSFACESTABBERSTATUE_BURST2, 0},
-	{"S_SUSPICIOUSFACESTABBERSTATUE_BURST2", 0, SPR_NULL, 0, 40, {A_StatueBurst}, MT_FACESTABBER, S_FACESTABBER_CHARGE2, S_NULL, 0},
+	{"SUSPICIOUSFACESTABBERSTATUE_WAIT", 0, SPR_CBBS, 0, 5, {A_Look}, 768*FRACUNIT, 0, S_SUSPICIOUSFACESTABBERSTATUE_WAIT, 0},
+	{"SUSPICIOUSFACESTABBERSTATUE_BURST1", 0, SPR_CBBS, FF_ANIMATE, 23, {NULL},    6, 1, S_SUSPICIOUSFACESTABBERSTATUE_BURST2, 0},
+	{"SUSPICIOUSFACESTABBERSTATUE_BURST2", 0, SPR_NULL, 0, 40, {A_StatueBurst}, MT_FACESTABBER, S_FACESTABBER_CHARGE2, S_NULL, 0},
 
-	{"S_BRAMBLES", 0, SPR_CABR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BRAMBLES", 0, SPR_CABR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Big Tumbleweed
-	{"S_BIGTUMBLEWEED", 0, SPR_BTBL, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BIGTUMBLEWEED_ROLL1", 0, SPR_BTBL, 0,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL2, 0},
-	{"S_BIGTUMBLEWEED_ROLL2", 0, SPR_BTBL, 1,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL3, 0},
-	{"S_BIGTUMBLEWEED_ROLL3", 0, SPR_BTBL, 2,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL4, 0},
-	{"S_BIGTUMBLEWEED_ROLL4", 0, SPR_BTBL, 3,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL5, 0},
-	{"S_BIGTUMBLEWEED_ROLL5", 0, SPR_BTBL, 4,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL6, 0},
-	{"S_BIGTUMBLEWEED_ROLL6", 0, SPR_BTBL, 5,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL7, 0},
-	{"S_BIGTUMBLEWEED_ROLL7", 0, SPR_BTBL, 6,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL8, 0},
-	{"S_BIGTUMBLEWEED_ROLL8", 0, SPR_BTBL, 7,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL1, 0},
+	{"BIGTUMBLEWEED", 0, SPR_BTBL, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BIGTUMBLEWEED_ROLL1", 0, SPR_BTBL, 0,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL2, 0},
+	{"BIGTUMBLEWEED_ROLL2", 0, SPR_BTBL, 1,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL3, 0},
+	{"BIGTUMBLEWEED_ROLL3", 0, SPR_BTBL, 2,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL4, 0},
+	{"BIGTUMBLEWEED_ROLL4", 0, SPR_BTBL, 3,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL5, 0},
+	{"BIGTUMBLEWEED_ROLL5", 0, SPR_BTBL, 4,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL6, 0},
+	{"BIGTUMBLEWEED_ROLL6", 0, SPR_BTBL, 5,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL7, 0},
+	{"BIGTUMBLEWEED_ROLL7", 0, SPR_BTBL, 6,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL8, 0},
+	{"BIGTUMBLEWEED_ROLL8", 0, SPR_BTBL, 7,  5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL1, 0},
 
 	// Little Tumbleweed
-	{"S_LITTLETUMBLEWEED", 0, SPR_STBL, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_LITTLETUMBLEWEED_ROLL1", 0, SPR_STBL, 0, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL2, 0},
-	{"S_LITTLETUMBLEWEED_ROLL2", 0, SPR_STBL, 1, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL3, 0},
-	{"S_LITTLETUMBLEWEED_ROLL3", 0, SPR_STBL, 2, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL4, 0},
-	{"S_LITTLETUMBLEWEED_ROLL4", 0, SPR_STBL, 3, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL5, 0},
-	{"S_LITTLETUMBLEWEED_ROLL5", 0, SPR_STBL, 4, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL6, 0},
-	{"S_LITTLETUMBLEWEED_ROLL6", 0, SPR_STBL, 5, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL7, 0},
-	{"S_LITTLETUMBLEWEED_ROLL7", 0, SPR_STBL, 6, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL8, 0},
-	{"S_LITTLETUMBLEWEED_ROLL8", 0, SPR_STBL, 7, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL1, 0},
+	{"LITTLETUMBLEWEED", 0, SPR_STBL, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"LITTLETUMBLEWEED_ROLL1", 0, SPR_STBL, 0, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL2, 0},
+	{"LITTLETUMBLEWEED_ROLL2", 0, SPR_STBL, 1, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL3, 0},
+	{"LITTLETUMBLEWEED_ROLL3", 0, SPR_STBL, 2, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL4, 0},
+	{"LITTLETUMBLEWEED_ROLL4", 0, SPR_STBL, 3, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL5, 0},
+	{"LITTLETUMBLEWEED_ROLL5", 0, SPR_STBL, 4, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL6, 0},
+	{"LITTLETUMBLEWEED_ROLL6", 0, SPR_STBL, 5, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL7, 0},
+	{"LITTLETUMBLEWEED_ROLL7", 0, SPR_STBL, 6, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL8, 0},
+	{"LITTLETUMBLEWEED_ROLL8", 0, SPR_STBL, 7, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL1, 0},
 
 	// Cacti
-	{"S_CACTI1", 0, SPR_CACT, 0, -1, {A_ConnectToGround}, MT_CACTITINYSEG, 0, S_NULL, 0},
-	{"S_CACTI2", 0, SPR_CACT, 1, -1, {A_ConnectToGround}, MT_CACTISMALLSEG, 0, S_NULL, 0},
-	{"S_CACTI3", 0, SPR_CACT, 2, -1, {A_ConnectToGround}, MT_CACTITINYSEG, 0, S_NULL, 0},
-	{"S_CACTI4", 0, SPR_CACT, 3, -1, {A_ConnectToGround}, MT_CACTISMALLSEG, 0, S_NULL, 0},
-	{"S_CACTI5", 0, SPR_CACT, 4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CACTI6", 0, SPR_CACT, 5, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CACTI7", 0, SPR_CACT, 6, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CACTI8", 0, SPR_CACT, 7, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CACTI9", 0, SPR_CACT, 8, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CACTI10", 0, SPR_CACT, 9, -1, {A_ConnectToGround}, MT_CACTITINYSEG, 0, S_NULL, 0},
-	{"S_CACTI11", 0, SPR_CACT, 10, -1, {A_ConnectToGround}, MT_CACTISMALLSEG, 0, S_NULL, 0},
-	{"S_CACTITINYSEG", 0, SPR_CACT, 11, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CACTISMALLSEG", 0, SPR_CACT, 12, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CACTI1", 0, SPR_CACT, 0, -1, {A_ConnectToGround}, MT_CACTITINYSEG, 0, S_NULL, 0},
+	{"CACTI2", 0, SPR_CACT, 1, -1, {A_ConnectToGround}, MT_CACTISMALLSEG, 0, S_NULL, 0},
+	{"CACTI3", 0, SPR_CACT, 2, -1, {A_ConnectToGround}, MT_CACTITINYSEG, 0, S_NULL, 0},
+	{"CACTI4", 0, SPR_CACT, 3, -1, {A_ConnectToGround}, MT_CACTISMALLSEG, 0, S_NULL, 0},
+	{"CACTI5", 0, SPR_CACT, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CACTI6", 0, SPR_CACT, 5, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CACTI7", 0, SPR_CACT, 6, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CACTI8", 0, SPR_CACT, 7, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CACTI9", 0, SPR_CACT, 8, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CACTI10", 0, SPR_CACT, 9, -1, {A_ConnectToGround}, MT_CACTITINYSEG, 0, S_NULL, 0},
+	{"CACTI11", 0, SPR_CACT, 10, -1, {A_ConnectToGround}, MT_CACTISMALLSEG, 0, S_NULL, 0},
+	{"CACTITINYSEG", 0, SPR_CACT, 11, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CACTISMALLSEG", 0, SPR_CACT, 12, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Warning Signs
-	{"S_ARIDSIGN_CAUTION", 0, SPR_WWSG, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_ARIDSIGN_CACTI", 0, SPR_WWS2, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_ARIDSIGN_SHARPTURN", 0, SPR_WWS3, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"ARIDSIGN_CAUTION", 0, SPR_WWSG, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"ARIDSIGN_CACTI", 0, SPR_WWS2, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"ARIDSIGN_SHARPTURN", 0, SPR_WWS3, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Oil lamp
-	{"S_OILLAMP", 0, SPR_OILL, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_OILLAMPFLARE", 0, SPR_OILF, FF_TRANS90|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"OILLAMP", 0, SPR_OILL, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"OILLAMPFLARE", 0, SPR_OILF, FF_TRANS90|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// TNT barrel
-	{"S_TNTBARREL_STND1", 0, SPR_BARR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_TNTBARREL_EXPL1", 0, SPR_BARX, 0, 0, {A_RollAngle}, 0, 1, S_TNTBARREL_EXPL2, 0},
-	{"S_TNTBARREL_EXPL2", 0, SPR_BARX, 0|FF_FULLBRIGHT, 3, {A_SetObjectFlags}, MF_NOCLIP|MF_NOGRAVITY|MF_NOBLOCKMAP, 0, S_TNTBARREL_EXPL3, 0},
-	{"S_TNTBARREL_EXPL3", 0, SPR_BARX, 1|FF_FULLBRIGHT, 2, {A_TNTExplode}, MT_TNTDUST, 0, S_TNTBARREL_EXPL4, 0},
-	{"S_TNTBARREL_EXPL4", 0, SPR_BARX, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_TNTBARREL_EXPL5, 0},
-	{"S_TNTBARREL_EXPL5", 0, SPR_BARX, 2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_TNTBARREL_EXPL6, 0},
-	{"S_TNTBARREL_EXPL6", 0, SPR_BARX, 3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_TNTBARREL_EXPL7, 0},
-	{"S_TNTBARREL_EXPL7", 0, SPR_NULL, 0, 35, {NULL}, 0, 0, S_NULL, 0},
+	{"TNTBARREL_STND1", 0, SPR_BARR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"TNTBARREL_EXPL1", 0, SPR_BARX, 0, 0, {A_RollAngle}, 0, 1, S_TNTBARREL_EXPL2, 0},
+	{"TNTBARREL_EXPL2", 0, SPR_BARX, 0|FF_FULLBRIGHT, 3, {A_SetObjectFlags}, MF_NOCLIP|MF_NOGRAVITY|MF_NOBLOCKMAP, 0, S_TNTBARREL_EXPL3, 0},
+	{"TNTBARREL_EXPL3", 0, SPR_BARX, 1|FF_FULLBRIGHT, 2, {A_TNTExplode}, MT_TNTDUST, 0, S_TNTBARREL_EXPL4, 0},
+	{"TNTBARREL_EXPL4", 0, SPR_BARX, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_TNTBARREL_EXPL5, 0},
+	{"TNTBARREL_EXPL5", 0, SPR_BARX, 2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_TNTBARREL_EXPL6, 0},
+	{"TNTBARREL_EXPL6", 0, SPR_BARX, 3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_TNTBARREL_EXPL7, 0},
+	{"TNTBARREL_EXPL7", 0, SPR_NULL, 0, 35, {NULL}, 0, 0, S_NULL, 0},
 #ifndef ROTSPRITE
-	{"S_TNTBARREL_FLYING", 0, SPR_BARR, 1|FF_ANIMATE, -1, {NULL}, 7, 2, S_NULL, 0},
+	{"TNTBARREL_FLYING", 0, SPR_BARR, 1|FF_ANIMATE, -1, {NULL}, 7, 2, S_NULL, 0},
 #else
-	{"S_TNTBARREL_FLYING", 0, SPR_BARR, 1, 1, {A_RollAngle}, 14, 0, S_TNTBARREL_FLYING, 0},
+	{"TNTBARREL_FLYING", 0, SPR_BARR, 1, 1, {A_RollAngle}, 14, 0, S_TNTBARREL_FLYING, 0},
 #endif
 
 	// TNT proximity shell
-	{"S_PROXIMITY_TNT", 0, SPR_REMT, 0, 10, {A_Look}, 33554433, 0, S_PROXIMITY_TNT, 0},
-	{"S_PROXIMITY_TNT_TRIGGER1", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER2, 0},
-	{"S_PROXIMITY_TNT_TRIGGER2", 0, SPR_REMT, 0, 16, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER3, 0},
-	{"S_PROXIMITY_TNT_TRIGGER3", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER4, 0},
-	{"S_PROXIMITY_TNT_TRIGGER4", 0, SPR_REMT, 0, 16, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER5, 0},
-	{"S_PROXIMITY_TNT_TRIGGER5", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER6, 0},
-	{"S_PROXIMITY_TNT_TRIGGER6", 0, SPR_REMT, 0, 4, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER7, 0},
-	{"S_PROXIMITY_TNT_TRIGGER7", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER8, 0},
-	{"S_PROXIMITY_TNT_TRIGGER8", 0, SPR_REMT, 0, 4, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER9, 0},
-	{"S_PROXIMITY_TNT_TRIGGER9", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER10, 0},
-	{"S_PROXIMITY_TNT_TRIGGER10", 0, SPR_REMT, 0, 4, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER11, 0},
-	{"S_PROXIMITY_TNT_TRIGGER11", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER12, 0},
-	{"S_PROXIMITY_TNT_TRIGGER12", 0, SPR_REMT, 0, 4, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER13, 0},
-	{"S_PROXIMITY_TNT_TRIGGER13", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER14, 0},
-	{"S_PROXIMITY_TNT_TRIGGER14", 0, SPR_REMT, 0, 2, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER15, 0},
-	{"S_PROXIMITY_TNT_TRIGGER15", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER16, 0},
-	{"S_PROXIMITY_TNT_TRIGGER16", 0, SPR_REMT, 0, 2, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER17, 0},
-	{"S_PROXIMITY_TNT_TRIGGER17", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER18, 0},
-	{"S_PROXIMITY_TNT_TRIGGER18", 0, SPR_REMT, 0, 2, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER19, 0},
-	{"S_PROXIMITY_TNT_TRIGGER19", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER20, 0},
-	{"S_PROXIMITY_TNT_TRIGGER20", 0, SPR_REMT, 0, 2, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER21, 0},
-	{"S_PROXIMITY_TNT_TRIGGER21", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER22, 0},
-	{"S_PROXIMITY_TNT_TRIGGER22", 0, SPR_REMT, 0, 2, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER23, 0},
-	{"S_PROXIMITY_TNT_TRIGGER23", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_TNTBARREL_EXPL1, 0},
+	{"PROXIMITY_TNT", 0, SPR_REMT, 0, 10, {A_Look}, 33554433, 0, S_PROXIMITY_TNT, 0},
+	{"PROXIMITY_TNT_TRIGGER1", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER2, 0},
+	{"PROXIMITY_TNT_TRIGGER2", 0, SPR_REMT, 0, 16, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER3, 0},
+	{"PROXIMITY_TNT_TRIGGER3", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER4, 0},
+	{"PROXIMITY_TNT_TRIGGER4", 0, SPR_REMT, 0, 16, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER5, 0},
+	{"PROXIMITY_TNT_TRIGGER5", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER6, 0},
+	{"PROXIMITY_TNT_TRIGGER6", 0, SPR_REMT, 0, 4, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER7, 0},
+	{"PROXIMITY_TNT_TRIGGER7", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER8, 0},
+	{"PROXIMITY_TNT_TRIGGER8", 0, SPR_REMT, 0, 4, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER9, 0},
+	{"PROXIMITY_TNT_TRIGGER9", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER10, 0},
+	{"PROXIMITY_TNT_TRIGGER10", 0, SPR_REMT, 0, 4, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER11, 0},
+	{"PROXIMITY_TNT_TRIGGER11", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER12, 0},
+	{"PROXIMITY_TNT_TRIGGER12", 0, SPR_REMT, 0, 4, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER13, 0},
+	{"PROXIMITY_TNT_TRIGGER13", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER14, 0},
+	{"PROXIMITY_TNT_TRIGGER14", 0, SPR_REMT, 0, 2, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER15, 0},
+	{"PROXIMITY_TNT_TRIGGER15", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER16, 0},
+	{"PROXIMITY_TNT_TRIGGER16", 0, SPR_REMT, 0, 2, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER17, 0},
+	{"PROXIMITY_TNT_TRIGGER17", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER18, 0},
+	{"PROXIMITY_TNT_TRIGGER18", 0, SPR_REMT, 0, 2, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER19, 0},
+	{"PROXIMITY_TNT_TRIGGER19", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER20, 0},
+	{"PROXIMITY_TNT_TRIGGER20", 0, SPR_REMT, 0, 2, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER21, 0},
+	{"PROXIMITY_TNT_TRIGGER21", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_PROXIMITY_TNT_TRIGGER22, 0},
+	{"PROXIMITY_TNT_TRIGGER22", 0, SPR_REMT, 0, 2, {NULL}, 0, 0, S_PROXIMITY_TNT_TRIGGER23, 0},
+	{"PROXIMITY_TNT_TRIGGER23", 0, SPR_REMT, 1|FF_FULLBRIGHT, 1, {A_PlayActiveSound}, 0, 0, S_TNTBARREL_EXPL1, 0},
 
 	// Dust devil
-	{"S_DUSTDEVIL", 0, SPR_NULL, 0, 1, {A_DustDevilThink}, 0, 0, S_DUSTDEVIL, 0},
-	{"S_DUSTLAYER1", 0, SPR_TAZD, 1|FF_PAPERSPRITE|FF_TRANS70, 2 * TICRATE, {NULL}, 0, 0, S_DUSTLAYER2, 0},
-	{"S_DUSTLAYER2", 0, SPR_TAZD, 1|FF_PAPERSPRITE|FF_TRANS70, 5, {NULL}, 0, 0, S_DUSTLAYER3, 0},
-	{"S_DUSTLAYER3", 0, SPR_TAZD, 1|FF_PAPERSPRITE|FF_TRANS80, 5, {NULL}, 0, 0, S_DUSTLAYER4, 0},
-	{"S_DUSTLAYER4", 0, SPR_TAZD, 1|FF_PAPERSPRITE|FF_TRANS80, 5, {NULL}, 0, 0, S_DUSTLAYER5, 0},
-	{"S_DUSTLAYER5", 0, SPR_TAZD, 1|FF_PAPERSPRITE|FF_TRANS90, 5, {NULL}, 0, 0, S_NULL, 0},
-	{"S_ARIDDUST1", 0, SPR_ADST, 0|FF_ANIMATE, 24, {NULL}, 3, 8, S_NULL, 0},
-	{"S_ARIDDUST2", 0, SPR_ADST, 3|FF_ANIMATE, 24, {NULL}, 3, 8, S_NULL, 0},
-	{"S_ARIDDUST3", 0, SPR_ADST, 6|FF_ANIMATE, 24, {NULL}, 3, 8, S_NULL, 0},
+	{"DUSTDEVIL", 0, SPR_NULL, 0, 1, {A_DustDevilThink}, 0, 0, S_DUSTDEVIL, 0},
+	{"DUSTLAYER1", 0, SPR_TAZD, 1|FF_PAPERSPRITE|FF_TRANS70, 2 * TICRATE, {NULL}, 0, 0, S_DUSTLAYER2, 0},
+	{"DUSTLAYER2", 0, SPR_TAZD, 1|FF_PAPERSPRITE|FF_TRANS70, 5, {NULL}, 0, 0, S_DUSTLAYER3, 0},
+	{"DUSTLAYER3", 0, SPR_TAZD, 1|FF_PAPERSPRITE|FF_TRANS80, 5, {NULL}, 0, 0, S_DUSTLAYER4, 0},
+	{"DUSTLAYER4", 0, SPR_TAZD, 1|FF_PAPERSPRITE|FF_TRANS80, 5, {NULL}, 0, 0, S_DUSTLAYER5, 0},
+	{"DUSTLAYER5", 0, SPR_TAZD, 1|FF_PAPERSPRITE|FF_TRANS90, 5, {NULL}, 0, 0, S_NULL, 0},
+	{"ARIDDUST1", 0, SPR_ADST, 0|FF_ANIMATE, 24, {NULL}, 3, 8, S_NULL, 0},
+	{"ARIDDUST2", 0, SPR_ADST, 3|FF_ANIMATE, 24, {NULL}, 3, 8, S_NULL, 0},
+	{"ARIDDUST3", 0, SPR_ADST, 6|FF_ANIMATE, 24, {NULL}, 3, 8, S_NULL, 0},
 
 	// Minecart
-	{"S_MINECART_IDLE", 0, SPR_NULL, 0,                            1, {NULL},                 0, 0, S_MINECART_IDLE, 0},
-	{"S_MINECART_DTH1", 0, SPR_NULL, 0,                            0, {A_KillSegments},       0, 0, S_TNTBARREL_EXPL4, 0},
-	{"S_MINECARTEND", 0, SPR_MCRT, 8|FF_PAPERSPRITE,            -1, {NULL},                 0, 0, S_NULL, 0},
-	{"S_MINECARTSEG_FRONT", 0, SPR_MCRT, 0|FF_PAPERSPRITE,            -1, {NULL},                 0, 0, S_NULL, 0},
-	{"S_MINECARTSEG_BACK", 0, SPR_MCRT, 1|FF_PAPERSPRITE,            -1, {NULL},                 0, 0, S_NULL, 0},
-	{"S_MINECARTSEG_LEFT", 0, SPR_MCRT, 2|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL},                 2, 3, S_NULL, 0},
-	{"S_MINECARTSEG_RIGHT", 0, SPR_MCRT, 5|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL},                 2, 3, S_NULL, 0},
-	{"S_MINECARTSIDEMARK1", 0, SPR_LCKN, 2|FF_FULLBRIGHT,              2, {NULL},                 0, 0, S_NULL, 0},
-	{"S_MINECARTSIDEMARK2", 0, SPR_LCKN, 0|FF_FULLBRIGHT,              2, {NULL},                 0, 0, S_NULL, 0},
-	{"S_MINECARTSPARK", 0, SPR_MCSP, FF_FULLBRIGHT,                1, {A_MinecartSparkThink}, 0, 0, S_MINECARTSPARK, 0},
+	{"MINECART_IDLE", 0, SPR_NULL, 0,                            1, {NULL},                 0, 0, S_MINECART_IDLE, 0},
+	{"MINECART_DTH1", 0, SPR_NULL, 0,                            0, {A_KillSegments},       0, 0, S_TNTBARREL_EXPL4, 0},
+	{"MINECARTEND", 0, SPR_MCRT, 8|FF_PAPERSPRITE,            -1, {NULL},                 0, 0, S_NULL, 0},
+	{"MINECARTSEG_FRONT", 0, SPR_MCRT, 0|FF_PAPERSPRITE,            -1, {NULL},                 0, 0, S_NULL, 0},
+	{"MINECARTSEG_BACK", 0, SPR_MCRT, 1|FF_PAPERSPRITE,            -1, {NULL},                 0, 0, S_NULL, 0},
+	{"MINECARTSEG_LEFT", 0, SPR_MCRT, 2|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL},                 2, 3, S_NULL, 0},
+	{"MINECARTSEG_RIGHT", 0, SPR_MCRT, 5|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL},                 2, 3, S_NULL, 0},
+	{"MINECARTSIDEMARK1", 0, SPR_LCKN, 2|FF_FULLBRIGHT,              2, {NULL},                 0, 0, S_NULL, 0},
+	{"MINECARTSIDEMARK2", 0, SPR_LCKN, 0|FF_FULLBRIGHT,              2, {NULL},                 0, 0, S_NULL, 0},
+	{"MINECARTSPARK", 0, SPR_MCSP, FF_FULLBRIGHT,                1, {A_MinecartSparkThink}, 0, 0, S_MINECARTSPARK, 0},
 
 	// Saloon door
-	{"S_SALOONDOOR", 0, SPR_SALD, 0|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_SALOONDOORCENTER", 0, SPR_NULL, 0, -1, {A_SaloonDoorSpawn}, MT_SALOONDOOR, 48, S_NULL, 0},
+	{"SALOONDOOR", 0, SPR_SALD, 0|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SALOONDOORCENTER", 0, SPR_NULL, 0, -1, {A_SaloonDoorSpawn}, MT_SALOONDOOR, 48, S_NULL, 0},
 
 	// Train cameo
-	{"S_TRAINCAMEOSPAWNER_1", 0, SPR_NULL, 0, -1, {NULL}, 0, 0, S_TRAINCAMEOSPAWNER_2, 0},
-	{"S_TRAINCAMEOSPAWNER_2", 0, SPR_NULL, 0, 14, {A_TrainCameo}, 20, 18, S_TRAINCAMEOSPAWNER_3, 0},
-	{"S_TRAINCAMEOSPAWNER_3", 0, SPR_NULL, 0, 1, {A_Repeat}, 1, 0, S_TRAINCAMEOSPAWNER_4, 0},
-	{"S_TRAINCAMEOSPAWNER_4", 0, SPR_NULL, 0, 18, {A_TrainCameo2}, 20, 44, S_TRAINCAMEOSPAWNER_5, 0},
-	{"S_TRAINCAMEOSPAWNER_5", 0, SPR_NULL, 0, 1, {A_Repeat}, 5, S_TRAINCAMEOSPAWNER_4, S_NULL, 0},
-	{"S_TRAINPUFFMAKER", 0, SPR_NULL, 0, 2, {A_SmokeTrailer}, MT_SMOKE, 0, S_TRAINPUFFMAKER, 0},
+	{"TRAINCAMEOSPAWNER_1", 0, SPR_NULL, 0, -1, {NULL}, 0, 0, S_TRAINCAMEOSPAWNER_2, 0},
+	{"TRAINCAMEOSPAWNER_2", 0, SPR_NULL, 0, 14, {A_TrainCameo}, 20, 18, S_TRAINCAMEOSPAWNER_3, 0},
+	{"TRAINCAMEOSPAWNER_3", 0, SPR_NULL, 0, 1, {A_Repeat}, 1, 0, S_TRAINCAMEOSPAWNER_4, 0},
+	{"TRAINCAMEOSPAWNER_4", 0, SPR_NULL, 0, 18, {A_TrainCameo2}, 20, 44, S_TRAINCAMEOSPAWNER_5, 0},
+	{"TRAINCAMEOSPAWNER_5", 0, SPR_NULL, 0, 1, {A_Repeat}, 5, S_TRAINCAMEOSPAWNER_4, S_NULL, 0},
+	{"TRAINPUFFMAKER", 0, SPR_NULL, 0, 2, {A_SmokeTrailer}, MT_SMOKE, 0, S_TRAINPUFFMAKER, 0},
 
-	{"S_TRAINDUST", 0, SPR_ADST, FF_TRANS50, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_TRAINSTEAM", 0, SPR_STEA, FF_TRANS50, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"TRAINDUST", 0, SPR_ADST, FF_TRANS50, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"TRAINSTEAM", 0, SPR_STEA, FF_TRANS50, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Flame jet
-	{"S_FLAMEJETSTND", 0, SPR_NULL, 0, 2*TICRATE, {NULL},             0, 0, S_FLAMEJETSTART, 0},
-	{"S_FLAMEJETSTART", 0, SPR_NULL, 0, 3*TICRATE, {A_ToggleFlameJet}, 0, 0,  S_FLAMEJETSTOP, 0},
-	{"S_FLAMEJETSTOP", 0, SPR_NULL, 0,         1, {A_ToggleFlameJet}, 0, 0,  S_FLAMEJETSTND, 0},
-	{"S_FLAMEJETFLAME1", 0, SPR_FLME, FF_FULLBRIGHT  ,  4, {NULL}, 0, 0, S_FLAMEJETFLAME2, 0},
-	{"S_FLAMEJETFLAME2", 0, SPR_FLME, FF_FULLBRIGHT|1,  5, {NULL}, 0, 0, S_FLAMEJETFLAME3, 0},
-	{"S_FLAMEJETFLAME3", 0, SPR_FLME, FF_FULLBRIGHT|2, 11, {NULL}, 0, 0,           S_NULL, 0},
-	{"S_FLAMEJETFLAME4", 0, SPR_FLME, FF_FULLBRIGHT|3,  4, {NULL}, 0, 0, S_FLAMEJETFLAME5, 0},
-	{"S_FLAMEJETFLAME5", 0, SPR_FLME, FF_FULLBRIGHT|4,  5, {NULL}, 0, 0, S_FLAMEJETFLAME6, 0},
-	{"S_FLAMEJETFLAME6", 0, SPR_FLME, FF_FULLBRIGHT|5, 11, {NULL}, 0, 0,           S_NULL, 0},
-	{"S_FLAMEJETFLAME7", 0, SPR_FLME, FF_FULLBRIGHT|6,  4, {NULL}, 0, 0, S_FLAMEJETFLAME8, 0},
-	{"S_FLAMEJETFLAME8", 0, SPR_FLME, FF_FULLBRIGHT|7,  5, {NULL}, 0, 0, S_FLAMEJETFLAME9, 0},
-	{"S_FLAMEJETFLAME9", 0, SPR_FLME, FF_FULLBRIGHT|8, 11, {NULL}, 0, 0,           S_NULL, 0},
+	{"FLAMEJETSTND", 0, SPR_NULL, 0, 2*TICRATE, {NULL},             0, 0, S_FLAMEJETSTART, 0},
+	{"FLAMEJETSTART", 0, SPR_NULL, 0, 3*TICRATE, {A_ToggleFlameJet}, 0, 0,  S_FLAMEJETSTOP, 0},
+	{"FLAMEJETSTOP", 0, SPR_NULL, 0,         1, {A_ToggleFlameJet}, 0, 0,  S_FLAMEJETSTND, 0},
+	{"FLAMEJETFLAME1", 0, SPR_FLME, FF_FULLBRIGHT  ,  4, {NULL}, 0, 0, S_FLAMEJETFLAME2, 0},
+	{"FLAMEJETFLAME2", 0, SPR_FLME, FF_FULLBRIGHT|1,  5, {NULL}, 0, 0, S_FLAMEJETFLAME3, 0},
+	{"FLAMEJETFLAME3", 0, SPR_FLME, FF_FULLBRIGHT|2, 11, {NULL}, 0, 0,           S_NULL, 0},
+	{"FLAMEJETFLAME4", 0, SPR_FLME, FF_FULLBRIGHT|3,  4, {NULL}, 0, 0, S_FLAMEJETFLAME5, 0},
+	{"FLAMEJETFLAME5", 0, SPR_FLME, FF_FULLBRIGHT|4,  5, {NULL}, 0, 0, S_FLAMEJETFLAME6, 0},
+	{"FLAMEJETFLAME6", 0, SPR_FLME, FF_FULLBRIGHT|5, 11, {NULL}, 0, 0,           S_NULL, 0},
+	{"FLAMEJETFLAME7", 0, SPR_FLME, FF_FULLBRIGHT|6,  4, {NULL}, 0, 0, S_FLAMEJETFLAME8, 0},
+	{"FLAMEJETFLAME8", 0, SPR_FLME, FF_FULLBRIGHT|7,  5, {NULL}, 0, 0, S_FLAMEJETFLAME9, 0},
+	{"FLAMEJETFLAME9", 0, SPR_FLME, FF_FULLBRIGHT|8, 11, {NULL}, 0, 0,           S_NULL, 0},
 
 	// Spinning flame jets
 	// A: Counter-clockwise
-	{"S_FJSPINAXISA1", 0, SPR_NULL, 0, 1,            {A_TrapShot}, MT_FLAMEJETFLAMEB, -(16<<16)|(1<<15)|64, S_FJSPINAXISA2, 0},
-	{"S_FJSPINAXISA2", 0, SPR_NULL, 0, 2, {A_ChangeAngleRelative},                 6,         6, S_FJSPINAXISA1, 0},
+	{"FJSPINAXISA1", 0, SPR_NULL, 0, 1,            {A_TrapShot}, MT_FLAMEJETFLAMEB, -(16<<16)|(1<<15)|64, S_FJSPINAXISA2, 0},
+	{"FJSPINAXISA2", 0, SPR_NULL, 0, 2, {A_ChangeAngleRelative},                 6,         6, S_FJSPINAXISA1, 0},
 
 	// B: Clockwise
-	{"S_FJSPINAXISB1", 0, SPR_NULL, 0, 1,            {A_TrapShot}, MT_FLAMEJETFLAMEB, -(16<<16)|(1<<15)|64, S_FJSPINAXISB2, 0},
-	{"S_FJSPINAXISB2", 0, SPR_NULL, 0, 2, {A_ChangeAngleRelative},                -6,        -6, S_FJSPINAXISB1, 0},
+	{"FJSPINAXISB1", 0, SPR_NULL, 0, 1,            {A_TrapShot}, MT_FLAMEJETFLAMEB, -(16<<16)|(1<<15)|64, S_FJSPINAXISB2, 0},
+	{"FJSPINAXISB2", 0, SPR_NULL, 0, 2, {A_ChangeAngleRelative},                -6,        -6, S_FJSPINAXISB1, 0},
 
 	// Blade's flame
-	{"S_FLAMEJETFLAMEB1", 0, SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40, 1, {A_MoveRelative}, 0, 5, S_FLAMEJETFLAMEB2, 0},
-	{"S_FLAMEJETFLAMEB2", 0, SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40, 1, {A_MoveRelative}, 0, 7, S_FLAMEJETFLAMEB3, 0},
-	{"S_FLAMEJETFLAMEB3", 0, SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|FF_ANIMATE, (12*7), {NULL}, 7, 12, S_NULL, 0},
+	{"FLAMEJETFLAMEB1", 0, SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40, 1, {A_MoveRelative}, 0, 5, S_FLAMEJETFLAMEB2, 0},
+	{"FLAMEJETFLAMEB2", 0, SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40, 1, {A_MoveRelative}, 0, 7, S_FLAMEJETFLAMEB3, 0},
+	{"FLAMEJETFLAMEB3", 0, SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|FF_ANIMATE, (12*7), {NULL}, 7, 12, S_NULL, 0},
 
 	// Lavafall
-	{"S_LAVAFALL_DORMANT", 0, SPR_LFAL, 5, 1, {NULL}, 0, 0, S_LAVAFALL_DORMANT, 0},
-	{"S_LAVAFALL_TELL", 0, SPR_LFAL, 6|FF_ANIMATE, 4, {A_LavafallRocks}, 1, 2, S_LAVAFALL_TELL, 0},
-	{"S_LAVAFALL_SHOOT", 0, SPR_LFAL, 9|FF_FULLBRIGHT|FF_ANIMATE, 2, {A_LavafallLava}, 1, 1, S_LAVAFALL_SHOOT, 0},
-	{"S_LAVAFALL_LAVA1", 0, SPR_LFAL, FF_FULLBRIGHT, 1, {A_FallingLavaCheck}, 0, 0, S_LAVAFALL_LAVA2, 0},
-	{"S_LAVAFALL_LAVA2", 0, SPR_LFAL, FF_FULLBRIGHT, 1, {A_FallingLavaCheck}, 0, 0, S_LAVAFALL_LAVA1, 0},
-	{"S_LAVAFALL_LAVA3", 0, SPR_LFAL, 2|FF_FULLBRIGHT|FF_ANIMATE, 9, {NULL}, 2, 3, S_NULL, 0},
-	{"S_LAVAFALLROCK", 0, SPR_LFAL, 11|FF_ANIMATE|FF_RANDOMANIM, 12, {NULL}, 3, 3, S_LAVAFALLROCK, 0},
+	{"LAVAFALL_DORMANT", 0, SPR_LFAL, 5, 1, {NULL}, 0, 0, S_LAVAFALL_DORMANT, 0},
+	{"LAVAFALL_TELL", 0, SPR_LFAL, 6|FF_ANIMATE, 4, {A_LavafallRocks}, 1, 2, S_LAVAFALL_TELL, 0},
+	{"LAVAFALL_SHOOT", 0, SPR_LFAL, 9|FF_FULLBRIGHT|FF_ANIMATE, 2, {A_LavafallLava}, 1, 1, S_LAVAFALL_SHOOT, 0},
+	{"LAVAFALL_LAVA1", 0, SPR_LFAL, FF_FULLBRIGHT, 1, {A_FallingLavaCheck}, 0, 0, S_LAVAFALL_LAVA2, 0},
+	{"LAVAFALL_LAVA2", 0, SPR_LFAL, FF_FULLBRIGHT, 1, {A_FallingLavaCheck}, 0, 0, S_LAVAFALL_LAVA1, 0},
+	{"LAVAFALL_LAVA3", 0, SPR_LFAL, 2|FF_FULLBRIGHT|FF_ANIMATE, 9, {NULL}, 2, 3, S_NULL, 0},
+	{"LAVAFALLROCK", 0, SPR_LFAL, 11|FF_ANIMATE|FF_RANDOMANIM, 12, {NULL}, 3, 3, S_LAVAFALLROCK, 0},
 
 	// Rollout Rock
-	{"S_ROLLOUTSPAWN", 0, SPR_NULL, 0, 1, {A_RolloutSpawn}, 256*FRACUNIT, MT_ROLLOUTROCK, S_ROLLOUTSPAWN, 0},
-	{"S_ROLLOUTROCK", 0, SPR_PUMI, 0, 1, {A_RolloutRock},    63*FRACUNIT/64,  7*FRACUNIT/10,  S_ROLLOUTROCK, 0},
+	{"ROLLOUTSPAWN", 0, SPR_NULL, 0, 1, {A_RolloutSpawn}, 256*FRACUNIT, MT_ROLLOUTROCK, S_ROLLOUTSPAWN, 0},
+	{"ROLLOUTROCK", 0, SPR_PUMI, 0, 1, {A_RolloutRock},    63*FRACUNIT/64,  7*FRACUNIT/10,  S_ROLLOUTROCK, 0},
 
 	// RVZ scenery
-	{"S_BIGFERNLEAF", 0, SPR_JPLA, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BIGFERN1", 0, SPR_JPLA, 1, 1, {NULL}, 0, 0, S_BIGFERN2, 0},
-	{"S_BIGFERN2", 0, SPR_JPLA, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_JUNGLEPALM", 0, SPR_JPLA, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_TORCHFLOWER", 0, SPR_TFLO, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_TORCHFLOWER, 0},
-	{"S_WALLVINE_LONG", 0, SPR_WVIN, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_WALLVINE_SHORT", 0, SPR_WVIN, 1|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BIGFERNLEAF", 0, SPR_JPLA, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BIGFERN1", 0, SPR_JPLA, 1, 1, {NULL}, 0, 0, S_BIGFERN2, 0},
+	{"BIGFERN2", 0, SPR_JPLA, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"JUNGLEPALM", 0, SPR_JPLA, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"TORCHFLOWER", 0, SPR_TFLO, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_TORCHFLOWER, 0},
+	{"WALLVINE_LONG", 0, SPR_WVIN, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"WALLVINE_SHORT", 0, SPR_WVIN, 1|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Glaregoyles
-	{"S_GLAREGOYLE", 0, SPR_BGAR,            0, 22, {NULL},       0, 0, S_GLAREGOYLE_CHARGE, 0},
-	{"S_GLAREGOYLE_CHARGE", 0, SPR_BGAR,            2,  6, {NULL},       0, 0, S_GLAREGOYLE_BLINK, 0},
-	{"S_GLAREGOYLE_BLINK", 0, SPR_BGAR, FF_ANIMATE|1, 18, {NULL},       1, 3, S_GLAREGOYLE_HOLD, 0},
-	{"S_GLAREGOYLE_HOLD", 0, SPR_BGAR,            1,  9, {NULL},       0, 0, S_GLAREGOYLE_FIRE, 0},
-	{"S_GLAREGOYLE_FIRE", 0, SPR_BGAR,            1,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_GLAREGOYLE_LOOP, 0},
-	{"S_GLAREGOYLE_LOOP", 0, SPR_BGAR,            1,  0, {A_Repeat},   3, S_GLAREGOYLE_FIRE, S_GLAREGOYLE_COOLDOWN, 0},
-	{"S_GLAREGOYLE_COOLDOWN", 0, SPR_BGAR, FF_ANIMATE|1, 15, {NULL},       1, 9, S_GLAREGOYLE, 0},
-
-	{"S_GLAREGOYLEUP", 0, SPR_BGAR,            0, 22, {NULL},       0, 0, S_GLAREGOYLEUP_CHARGE, 0},
-	{"S_GLAREGOYLEUP_CHARGE", 0, SPR_BGAR,            2,  6, {NULL},       0, 0, S_GLAREGOYLEUP_BLINK, 0},
-	{"S_GLAREGOYLEUP_BLINK", 0, SPR_BGAR, FF_ANIMATE|1, 18, {NULL},       1, 3, S_GLAREGOYLEUP_HOLD, 0},
-	{"S_GLAREGOYLEUP_HOLD", 0, SPR_BGAR,            1,  9, {NULL},       0, 0, S_GLAREGOYLEUP_FIRE, 0},
-	{"S_GLAREGOYLEUP_FIRE", 0, SPR_BGAR,            1,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_GLAREGOYLEUP_LOOP, 0},
-	{"S_GLAREGOYLEUP_LOOP", 0, SPR_BGAR,            1,  0, {A_Repeat},   3, S_GLAREGOYLEUP_FIRE, S_GLAREGOYLEUP_COOLDOWN, 0},
-	{"S_GLAREGOYLEUP_COOLDOWN", 0, SPR_BGAR, FF_ANIMATE|1, 15, {NULL},       1, 9, S_GLAREGOYLEUP, 0},
-
-	{"S_GLAREGOYLEDOWN", 0, SPR_BGAR,            0, 22, {NULL},       0, 0, S_GLAREGOYLEDOWN_CHARGE, 0},
-	{"S_GLAREGOYLEDOWN_CHARGE", 0, SPR_BGAR,            2,  6, {NULL},       0, 0, S_GLAREGOYLEDOWN_BLINK, 0},
-	{"S_GLAREGOYLEDOWN_BLINK", 0, SPR_BGAR, FF_ANIMATE|1, 18, {NULL},       1, 3, S_GLAREGOYLEDOWN_HOLD, 0},
-	{"S_GLAREGOYLEDOWN_HOLD", 0, SPR_BGAR,            1,  9, {NULL},       0, 0, S_GLAREGOYLEDOWN_FIRE, 0},
-	{"S_GLAREGOYLEDOWN_FIRE", 0, SPR_BGAR,            1,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_GLAREGOYLEDOWN_LOOP, 0},
-	{"S_GLAREGOYLEDOWN_LOOP", 0, SPR_BGAR,            1,  0, {A_Repeat},   3, S_GLAREGOYLEDOWN_FIRE, S_GLAREGOYLEDOWN_COOLDOWN, 0},
-	{"S_GLAREGOYLEDOWN_COOLDOWN", 0, SPR_BGAR, FF_ANIMATE|1, 15, {NULL},       1, 9, S_GLAREGOYLEDOWN, 0},
-
-	{"S_GLAREGOYLELONG", 0, SPR_BGAR,            0, 90, {NULL},       0, 0, S_GLAREGOYLELONG_CHARGE, 0},
-	{"S_GLAREGOYLELONG_CHARGE", 0, SPR_BGAR,            2,  6, {NULL},       0, 0, S_GLAREGOYLELONG_BLINK, 0},
-	{"S_GLAREGOYLELONG_BLINK", 0, SPR_BGAR, FF_ANIMATE|1, 18, {NULL},       1, 3, S_GLAREGOYLELONG_HOLD, 0},
-	{"S_GLAREGOYLELONG_HOLD", 0, SPR_BGAR,            1,  9, {NULL},       0, 0, S_GLAREGOYLELONG_FIRE, 0},
-	{"S_GLAREGOYLELONG_FIRE", 0, SPR_BGAR,            1,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_GLAREGOYLELONG_LOOP, 0},
-	{"S_GLAREGOYLELONG_LOOP", 0, SPR_BGAR,            1,  0, {A_Repeat},   5, S_GLAREGOYLELONG_FIRE, S_GLAREGOYLELONG_COOLDOWN, 0},
-	{"S_GLAREGOYLELONG_COOLDOWN", 0, SPR_BGAR, FF_ANIMATE|1, 15, {NULL},       1, 9, S_GLAREGOYLELONG, 0},
+	{"GLAREGOYLE", 0, SPR_BGAR,            0, 22, {NULL},       0, 0, S_GLAREGOYLE_CHARGE, 0},
+	{"GLAREGOYLE_CHARGE", 0, SPR_BGAR,            2,  6, {NULL},       0, 0, S_GLAREGOYLE_BLINK, 0},
+	{"GLAREGOYLE_BLINK", 0, SPR_BGAR, FF_ANIMATE|1, 18, {NULL},       1, 3, S_GLAREGOYLE_HOLD, 0},
+	{"GLAREGOYLE_HOLD", 0, SPR_BGAR,            1,  9, {NULL},       0, 0, S_GLAREGOYLE_FIRE, 0},
+	{"GLAREGOYLE_FIRE", 0, SPR_BGAR,            1,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_GLAREGOYLE_LOOP, 0},
+	{"GLAREGOYLE_LOOP", 0, SPR_BGAR,            1,  0, {A_Repeat},   3, S_GLAREGOYLE_FIRE, S_GLAREGOYLE_COOLDOWN, 0},
+	{"GLAREGOYLE_COOLDOWN", 0, SPR_BGAR, FF_ANIMATE|1, 15, {NULL},       1, 9, S_GLAREGOYLE, 0},
+
+	{"GLAREGOYLEUP", 0, SPR_BGAR,            0, 22, {NULL},       0, 0, S_GLAREGOYLEUP_CHARGE, 0},
+	{"GLAREGOYLEUP_CHARGE", 0, SPR_BGAR,            2,  6, {NULL},       0, 0, S_GLAREGOYLEUP_BLINK, 0},
+	{"GLAREGOYLEUP_BLINK", 0, SPR_BGAR, FF_ANIMATE|1, 18, {NULL},       1, 3, S_GLAREGOYLEUP_HOLD, 0},
+	{"GLAREGOYLEUP_HOLD", 0, SPR_BGAR,            1,  9, {NULL},       0, 0, S_GLAREGOYLEUP_FIRE, 0},
+	{"GLAREGOYLEUP_FIRE", 0, SPR_BGAR,            1,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_GLAREGOYLEUP_LOOP, 0},
+	{"GLAREGOYLEUP_LOOP", 0, SPR_BGAR,            1,  0, {A_Repeat},   3, S_GLAREGOYLEUP_FIRE, S_GLAREGOYLEUP_COOLDOWN, 0},
+	{"GLAREGOYLEUP_COOLDOWN", 0, SPR_BGAR, FF_ANIMATE|1, 15, {NULL},       1, 9, S_GLAREGOYLEUP, 0},
+
+	{"GLAREGOYLEDOWN", 0, SPR_BGAR,            0, 22, {NULL},       0, 0, S_GLAREGOYLEDOWN_CHARGE, 0},
+	{"GLAREGOYLEDOWN_CHARGE", 0, SPR_BGAR,            2,  6, {NULL},       0, 0, S_GLAREGOYLEDOWN_BLINK, 0},
+	{"GLAREGOYLEDOWN_BLINK", 0, SPR_BGAR, FF_ANIMATE|1, 18, {NULL},       1, 3, S_GLAREGOYLEDOWN_HOLD, 0},
+	{"GLAREGOYLEDOWN_HOLD", 0, SPR_BGAR,            1,  9, {NULL},       0, 0, S_GLAREGOYLEDOWN_FIRE, 0},
+	{"GLAREGOYLEDOWN_FIRE", 0, SPR_BGAR,            1,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_GLAREGOYLEDOWN_LOOP, 0},
+	{"GLAREGOYLEDOWN_LOOP", 0, SPR_BGAR,            1,  0, {A_Repeat},   3, S_GLAREGOYLEDOWN_FIRE, S_GLAREGOYLEDOWN_COOLDOWN, 0},
+	{"GLAREGOYLEDOWN_COOLDOWN", 0, SPR_BGAR, FF_ANIMATE|1, 15, {NULL},       1, 9, S_GLAREGOYLEDOWN, 0},
+
+	{"GLAREGOYLELONG", 0, SPR_BGAR,            0, 90, {NULL},       0, 0, S_GLAREGOYLELONG_CHARGE, 0},
+	{"GLAREGOYLELONG_CHARGE", 0, SPR_BGAR,            2,  6, {NULL},       0, 0, S_GLAREGOYLELONG_BLINK, 0},
+	{"GLAREGOYLELONG_BLINK", 0, SPR_BGAR, FF_ANIMATE|1, 18, {NULL},       1, 3, S_GLAREGOYLELONG_HOLD, 0},
+	{"GLAREGOYLELONG_HOLD", 0, SPR_BGAR,            1,  9, {NULL},       0, 0, S_GLAREGOYLELONG_FIRE, 0},
+	{"GLAREGOYLELONG_FIRE", 0, SPR_BGAR,            1,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_GLAREGOYLELONG_LOOP, 0},
+	{"GLAREGOYLELONG_LOOP", 0, SPR_BGAR,            1,  0, {A_Repeat},   5, S_GLAREGOYLELONG_FIRE, S_GLAREGOYLELONG_COOLDOWN, 0},
+	{"GLAREGOYLELONG_COOLDOWN", 0, SPR_BGAR, FF_ANIMATE|1, 15, {NULL},       1, 9, S_GLAREGOYLELONG, 0},
 
 	// Target/Red Crystal
-	{"S_TARGET_IDLE", 0, SPR_RCRY,               0, -1, {NULL},                  0, 0, S_TARGET_IDLE, 0},
-	{"S_TARGET_HIT1", 0, SPR_RCRY, FF_FULLBRIGHT|1,  0, {A_PlaySound},           sfx_ding, 1, S_TARGET_HIT2, 0},
-	{"S_TARGET_HIT2", 0, SPR_RCRY, FF_FULLBRIGHT|1, 45, {A_SetObjectFlags},      MF_PUSHABLE, 2, S_TARGET_RESPAWN, 0},
-	{"S_TARGET_RESPAWN", 0, SPR_RCRY,               1,  0, {A_SpawnObjectRelative}, 0, MT_TARGET, S_NULL, 0},
-	{"S_TARGET_ALLDONE", 0, SPR_RCRY, FF_FULLBRIGHT|1, -1, {A_SetObjectFlags},      MF_PUSHABLE, 1, S_TARGET_ALLDONE, 0},
+	{"TARGET_IDLE", 0, SPR_RCRY,               0, -1, {NULL},                  0, 0, S_TARGET_IDLE, 0},
+	{"TARGET_HIT1", 0, SPR_RCRY, FF_FULLBRIGHT|1,  0, {A_PlaySound},           sfx_ding, 1, S_TARGET_HIT2, 0},
+	{"TARGET_HIT2", 0, SPR_RCRY, FF_FULLBRIGHT|1, 45, {A_SetObjectFlags},      MF_PUSHABLE, 2, S_TARGET_RESPAWN, 0},
+	{"TARGET_RESPAWN", 0, SPR_RCRY,               1,  0, {A_SpawnObjectRelative}, 0, MT_TARGET, S_NULL, 0},
+	{"TARGET_ALLDONE", 0, SPR_RCRY, FF_FULLBRIGHT|1, -1, {A_SetObjectFlags},      MF_PUSHABLE, 1, S_TARGET_ALLDONE, 0},
 
 	// Green flame
-	{"S_GREENFLAME", 0, SPR_CFLM, FF_FULLBRIGHT|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 3, S_GREENFLAME, 0},
+	{"GREENFLAME", 0, SPR_CFLM, FF_FULLBRIGHT|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 3, S_GREENFLAME, 0},
 
 	// ATZ Blue Gargoyle
-	{"S_BLUEGARGOYLE", 0, SPR_BGAR, 3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BLUEGARGOYLE", 0, SPR_BGAR, 3, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Stalagmites
-	{"S_STG0", 0, SPR_STLG, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_STG1", 0, SPR_STLG, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_STG2", 0, SPR_STLG, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_STG3", 0, SPR_STLG, 3, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_STG4", 0, SPR_STLG, 4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_STG5", 0, SPR_STLG, 5, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_STG6", 0, SPR_STLG, 6, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_STG7", 0, SPR_STLG, 7, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_STG8", 0, SPR_STLG, 8, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_STG9", 0, SPR_STLG, 9, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"STG0", 0, SPR_STLG, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"STG1", 0, SPR_STLG, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"STG2", 0, SPR_STLG, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"STG3", 0, SPR_STLG, 3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"STG4", 0, SPR_STLG, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"STG5", 0, SPR_STLG, 5, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"STG6", 0, SPR_STLG, 6, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"STG7", 0, SPR_STLG, 7, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"STG8", 0, SPR_STLG, 8, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"STG9", 0, SPR_STLG, 9, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Xmas-specific stuff
-	{"S_XMASPOLE", 0, SPR_XMS1, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_CANDYCANE", 0, SPR_XMS2, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_SNOWMAN", 0, SPR_XMS3, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_SNOWMANHAT", 0, SPR_XMS3, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_LAMPPOST1", 0, SPR_XMS4, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_LAMPPOST2", 0, SPR_XMS4, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_HANGSTAR", 0, SPR_XMS5, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_MISTLETOE", 0, SPR_XMS6, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"XMASPOLE", 0, SPR_XMS1, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CANDYCANE", 0, SPR_XMS2, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SNOWMAN", 0, SPR_XMS3, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SNOWMANHAT", 0, SPR_XMS3, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"LAMPPOST1", 0, SPR_XMS4, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"LAMPPOST2", 0, SPR_XMS4, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"HANGSTAR", 0, SPR_XMS5, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"MISTLETOE", 0, SPR_XMS6, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 	// Xmas GFZ bushes
-	{"S_XMASBLUEBERRYBUSH", 0, SPR_BUS3, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_XMASBERRYBUSH", 0, SPR_BUS1, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_XMASBUSH", 0, SPR_BUS2, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"XMASBLUEBERRYBUSH", 0, SPR_BUS3, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"XMASBERRYBUSH", 0, SPR_BUS1, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"XMASBUSH", 0, SPR_BUS2, 1, -1, {NULL}, 0, 0, S_NULL, 0},
 	// FHZ
-	{"S_FHZICE1", 0, SPR_FHZI, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_FHZICE2", 0, SPR_FHZI, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_ROSY_IDLE1", 0, SPR_ROSY, 16, 8, {NULL}, 0, 0, S_ROSY_IDLE2, 0},
-	{"S_ROSY_IDLE2", 0, SPR_ROSY, 17, 4, {NULL}, 0, 0, S_ROSY_IDLE3, 0},
-	{"S_ROSY_IDLE3", 0, SPR_ROSY, 18, 8, {NULL}, 0, 0, S_ROSY_IDLE4, 0},
-	{"S_ROSY_IDLE4", 0, SPR_ROSY, 17, 4, {NULL}, 0, 0, S_ROSY_IDLE1, 0},
-	{"S_ROSY_JUMP", 0, SPR_ROSY, 14, -1, {NULL}, 1, 0, S_NULL, 0},
-	{"S_ROSY_WALK", 0, SPR_ROSY,  5, -1, {NULL}, 7, 0, S_NULL, 0},
-	{"S_ROSY_HUG", 0, SPR_ROSY, 19, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_ROSY_PAIN", 0, SPR_ROSY, 13, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_ROSY_STND", 0, SPR_ROSY,  1|FF_ANIMATE, -1, {NULL}, 3, 16, S_NULL, 0},
-	{"S_ROSY_UNHAPPY", 0, SPR_ROSY, 20|FF_ANIMATE, TICRATE, {NULL}, 3, 4, S_ROSY_WALK, 0},
+	{"FHZICE1", 0, SPR_FHZI, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"FHZICE2", 0, SPR_FHZI, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"ROSY_IDLE1", 0, SPR_ROSY, 16, 8, {NULL}, 0, 0, S_ROSY_IDLE2, 0},
+	{"ROSY_IDLE2", 0, SPR_ROSY, 17, 4, {NULL}, 0, 0, S_ROSY_IDLE3, 0},
+	{"ROSY_IDLE3", 0, SPR_ROSY, 18, 8, {NULL}, 0, 0, S_ROSY_IDLE4, 0},
+	{"ROSY_IDLE4", 0, SPR_ROSY, 17, 4, {NULL}, 0, 0, S_ROSY_IDLE1, 0},
+	{"ROSY_JUMP", 0, SPR_ROSY, 14, -1, {NULL}, 1, 0, S_NULL, 0},
+	{"ROSY_WALK", 0, SPR_ROSY,  5, -1, {NULL}, 7, 0, S_NULL, 0},
+	{"ROSY_HUG", 0, SPR_ROSY, 19, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"ROSY_PAIN", 0, SPR_ROSY, 13, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"ROSY_STND", 0, SPR_ROSY,  1|FF_ANIMATE, -1, {NULL}, 3, 16, S_NULL, 0},
+	{"ROSY_UNHAPPY", 0, SPR_ROSY, 20|FF_ANIMATE, TICRATE, {NULL}, 3, 4, S_ROSY_WALK, 0},
 
 	// Halloween Scenery
 	// Pumpkins
-	{"S_JACKO1", 0, SPR_PUMK,  0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_JACKO1OVERLAY_1", 0, SPR_PUMK,  3|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO1OVERLAY_2, 0},
-	{"S_JACKO1OVERLAY_2", 0, SPR_PUMK,  4|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO1OVERLAY_3, 0},
-	{"S_JACKO1OVERLAY_3", 0, SPR_PUMK,  5|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO1OVERLAY_4, 0},
-	{"S_JACKO1OVERLAY_4", 0, SPR_PUMK,  4|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO1OVERLAY_1, 0},
-	{"S_JACKO2", 0, SPR_PUMK,  1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_JACKO2OVERLAY_1", 0, SPR_PUMK,  6|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO2OVERLAY_2, 0},
-	{"S_JACKO2OVERLAY_2", 0, SPR_PUMK,  7|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO2OVERLAY_3, 0},
-	{"S_JACKO2OVERLAY_3", 0, SPR_PUMK,  8|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO2OVERLAY_4, 0},
-	{"S_JACKO2OVERLAY_4", 0, SPR_PUMK,  7|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO2OVERLAY_1, 0},
-	{"S_JACKO3", 0, SPR_PUMK,  2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_JACKO3OVERLAY_1", 0, SPR_PUMK,  9|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO3OVERLAY_2, 0},
-	{"S_JACKO3OVERLAY_2", 0, SPR_PUMK, 10|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO3OVERLAY_3, 0},
-	{"S_JACKO3OVERLAY_3", 0, SPR_PUMK, 11|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO3OVERLAY_4, 0},
-	{"S_JACKO3OVERLAY_4", 0, SPR_PUMK, 10|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO3OVERLAY_1, 0},
+	{"JACKO1", 0, SPR_PUMK,  0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"JACKO1OVERLAY_1", 0, SPR_PUMK,  3|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO1OVERLAY_2, 0},
+	{"JACKO1OVERLAY_2", 0, SPR_PUMK,  4|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO1OVERLAY_3, 0},
+	{"JACKO1OVERLAY_3", 0, SPR_PUMK,  5|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO1OVERLAY_4, 0},
+	{"JACKO1OVERLAY_4", 0, SPR_PUMK,  4|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO1OVERLAY_1, 0},
+	{"JACKO2", 0, SPR_PUMK,  1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"JACKO2OVERLAY_1", 0, SPR_PUMK,  6|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO2OVERLAY_2, 0},
+	{"JACKO2OVERLAY_2", 0, SPR_PUMK,  7|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO2OVERLAY_3, 0},
+	{"JACKO2OVERLAY_3", 0, SPR_PUMK,  8|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO2OVERLAY_4, 0},
+	{"JACKO2OVERLAY_4", 0, SPR_PUMK,  7|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO2OVERLAY_1, 0},
+	{"JACKO3", 0, SPR_PUMK,  2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"JACKO3OVERLAY_1", 0, SPR_PUMK,  9|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO3OVERLAY_2, 0},
+	{"JACKO3OVERLAY_2", 0, SPR_PUMK, 10|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO3OVERLAY_3, 0},
+	{"JACKO3OVERLAY_3", 0, SPR_PUMK, 11|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO3OVERLAY_4, 0},
+	{"JACKO3OVERLAY_4", 0, SPR_PUMK, 10|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO3OVERLAY_1, 0},
 	// Dr Seuss Trees
-	{"S_HHZTREE_TOP", 0, SPR_HHPL, 2, -1, {A_ConnectToGround}, MT_HHZTREE_PART, 0, S_NULL, 0},
-	{"S_HHZTREE_TRUNK", 0, SPR_HHPL, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_HHZTREE_LEAF", 0, SPR_HHPL, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"HHZTREE_TOP", 0, SPR_HHPL, 2, -1, {A_ConnectToGround}, MT_HHZTREE_PART, 0, S_NULL, 0},
+	{"HHZTREE_TRUNK", 0, SPR_HHPL, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"HHZTREE_LEAF", 0, SPR_HHPL, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL, 0},
 	// Mushroom
-	{"S_HHZSHROOM_1", 0, SPR_SHRM, 4,  3, {NULL}, 0, 0, S_HHZSHROOM_2, 0},
-	{"S_HHZSHROOM_2", 0, SPR_SHRM, 3,  3, {NULL}, 0, 0, S_HHZSHROOM_3, 0},
-	{"S_HHZSHROOM_3", 0, SPR_SHRM, 2,  2, {NULL}, 0, 0, S_HHZSHROOM_4, 0},
-	{"S_HHZSHROOM_4", 0, SPR_SHRM, 1,  1, {NULL}, 0, 0, S_HHZSHROOM_5, 0},
-	{"S_HHZSHROOM_5", 0, SPR_SHRM, 0,  1, {NULL}, 0, 0, S_HHZSHROOM_6, 0},
-	{"S_HHZSHROOM_6", 0, SPR_SHRM, 1,  4, {NULL}, 0, 0, S_HHZSHROOM_7, 0},
-	{"S_HHZSHROOM_7", 0, SPR_SHRM, 2,  2, {NULL}, 0, 0, S_HHZSHROOM_8, 0},
-	{"S_HHZSHROOM_8", 0, SPR_SHRM, 3,  3, {NULL}, 0, 0, S_HHZSHROOM_9, 0},
-	{"S_HHZSHROOM_9", 0, SPR_SHRM, 4,  3, {NULL}, 0, 0, S_HHZSHROOM_10, 0},
-	{"S_HHZSHROOM_10", 0, SPR_SHRM, 3,  3, {NULL}, 0, 0, S_HHZSHROOM_11, 0},
-	{"S_HHZSHROOM_11", 0, SPR_SHRM, 5,  2, {NULL}, 0, 0, S_HHZSHROOM_12, 0},
-	{"S_HHZSHROOM_12", 0, SPR_SHRM, 6,  1, {NULL}, 0, 0, S_HHZSHROOM_13, 0},
-	{"S_HHZSHROOM_13", 0, SPR_SHRM, 7,  1, {NULL}, 0, 0, S_HHZSHROOM_14, 0},
-	{"S_HHZSHROOM_14", 0, SPR_SHRM, 6,  4, {NULL}, 0, 0, S_HHZSHROOM_15, 0},
-	{"S_HHZSHROOM_15", 0, SPR_SHRM, 5,  2, {NULL}, 0, 0, S_HHZSHROOM_16, 0},
-	{"S_HHZSHROOM_16", 0, SPR_SHRM, 3,  3, {NULL}, 0, 0, S_HHZSHROOM_1, 0},
+	{"HHZSHROOM_1", 0, SPR_SHRM, 4,  3, {NULL}, 0, 0, S_HHZSHROOM_2, 0},
+	{"HHZSHROOM_2", 0, SPR_SHRM, 3,  3, {NULL}, 0, 0, S_HHZSHROOM_3, 0},
+	{"HHZSHROOM_3", 0, SPR_SHRM, 2,  2, {NULL}, 0, 0, S_HHZSHROOM_4, 0},
+	{"HHZSHROOM_4", 0, SPR_SHRM, 1,  1, {NULL}, 0, 0, S_HHZSHROOM_5, 0},
+	{"HHZSHROOM_5", 0, SPR_SHRM, 0,  1, {NULL}, 0, 0, S_HHZSHROOM_6, 0},
+	{"HHZSHROOM_6", 0, SPR_SHRM, 1,  4, {NULL}, 0, 0, S_HHZSHROOM_7, 0},
+	{"HHZSHROOM_7", 0, SPR_SHRM, 2,  2, {NULL}, 0, 0, S_HHZSHROOM_8, 0},
+	{"HHZSHROOM_8", 0, SPR_SHRM, 3,  3, {NULL}, 0, 0, S_HHZSHROOM_9, 0},
+	{"HHZSHROOM_9", 0, SPR_SHRM, 4,  3, {NULL}, 0, 0, S_HHZSHROOM_10, 0},
+	{"HHZSHROOM_10", 0, SPR_SHRM, 3,  3, {NULL}, 0, 0, S_HHZSHROOM_11, 0},
+	{"HHZSHROOM_11", 0, SPR_SHRM, 5,  2, {NULL}, 0, 0, S_HHZSHROOM_12, 0},
+	{"HHZSHROOM_12", 0, SPR_SHRM, 6,  1, {NULL}, 0, 0, S_HHZSHROOM_13, 0},
+	{"HHZSHROOM_13", 0, SPR_SHRM, 7,  1, {NULL}, 0, 0, S_HHZSHROOM_14, 0},
+	{"HHZSHROOM_14", 0, SPR_SHRM, 6,  4, {NULL}, 0, 0, S_HHZSHROOM_15, 0},
+	{"HHZSHROOM_15", 0, SPR_SHRM, 5,  2, {NULL}, 0, 0, S_HHZSHROOM_16, 0},
+	{"HHZSHROOM_16", 0, SPR_SHRM, 3,  3, {NULL}, 0, 0, S_HHZSHROOM_1, 0},
 	// Misc
-	{"S_HHZGRASS", 0, SPR_HHZM, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_HHZTENT1", 0, SPR_HHZM, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_HHZTENT2", 0, SPR_HHZM, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_HHZSTALAGMITE_TALL", 0, SPR_HHZM, 4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_HHZSTALAGMITE_SHORT", 0, SPR_HHZM, 5, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"HHZGRASS", 0, SPR_HHZM, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"HHZTENT1", 0, SPR_HHZM, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"HHZTENT2", 0, SPR_HHZM, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"HHZSTALAGMITE_TALL", 0, SPR_HHZM, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"HHZSTALAGMITE_SHORT", 0, SPR_HHZM, 5, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Loads of Botanic Serenity bullshit
-	{"S_BSZTALLFLOWER_RED", 0, SPR_BSZ1, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZTALLFLOWER_PURPLE", 0, SPR_BSZ1, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZTALLFLOWER_BLUE", 0, SPR_BSZ1, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZTALLFLOWER_CYAN", 0, SPR_BSZ1, 3, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZTALLFLOWER_YELLOW", 0, SPR_BSZ1, 4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZTALLFLOWER_ORANGE", 0, SPR_BSZ1, 5, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZFLOWER_RED", 0, SPR_BSZ2, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZFLOWER_PURPLE", 0, SPR_BSZ2, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZFLOWER_BLUE", 0, SPR_BSZ2, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZFLOWER_CYAN", 0, SPR_BSZ2, 3, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZFLOWER_YELLOW", 0, SPR_BSZ2, 4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZFLOWER_ORANGE", 0, SPR_BSZ2, 5, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZSHORTFLOWER_RED", 0, SPR_BSZ3, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZSHORTFLOWER_PURPLE", 0, SPR_BSZ3, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZSHORTFLOWER_BLUE", 0, SPR_BSZ3, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZSHORTFLOWER_CYAN", 0, SPR_BSZ3, 3, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZSHORTFLOWER_YELLOW", 0, SPR_BSZ3, 4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZSHORTFLOWER_ORANGE", 0, SPR_BSZ3, 5, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZTULIP_RED", 0, SPR_BST1, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
-	{"S_BSZTULIP_PURPLE", 0, SPR_BST2, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
-	{"S_BSZTULIP_BLUE", 0, SPR_BST3, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
-	{"S_BSZTULIP_CYAN", 0, SPR_BST4, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
-	{"S_BSZTULIP_YELLOW", 0, SPR_BST5, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
-	{"S_BSZTULIP_ORANGE", 0, SPR_BST6, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
-	{"S_BSZCLUSTER_RED", 0, SPR_BSZ5, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZCLUSTER_PURPLE", 0, SPR_BSZ5, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZCLUSTER_BLUE", 0, SPR_BSZ5, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZCLUSTER_CYAN", 0, SPR_BSZ5, 3, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZCLUSTER_YELLOW", 0, SPR_BSZ5, 4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZCLUSTER_ORANGE", 0, SPR_BSZ5, 5, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZBUSH_RED", 0, SPR_BSZ6, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZBUSH_PURPLE", 0, SPR_BSZ6, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZBUSH_BLUE", 0, SPR_BSZ6, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZBUSH_CYAN", 0, SPR_BSZ6, 3, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZBUSH_YELLOW", 0, SPR_BSZ6, 4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZBUSH_ORANGE", 0, SPR_BSZ6, 5, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZVINE_RED", 0, SPR_BSZ7, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZVINE_PURPLE", 0, SPR_BSZ7, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZVINE_BLUE", 0, SPR_BSZ7, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZVINE_CYAN", 0, SPR_BSZ7, 3, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZVINE_YELLOW", 0, SPR_BSZ7, 4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZVINE_ORANGE", 0, SPR_BSZ7, 5, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZSHRUB", 0, SPR_BSZ8, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BSZCLOVER", 0, SPR_BSZ8, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BIG_PALMTREE_TRUNK", 0, SPR_BSZ8, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BIG_PALMTREE_TOP", 0, SPR_BSZ8, 3, -1, {A_ConnectToGround}, MT_BIG_PALMTREE_TRUNK, 0, S_NULL, 0},
-	{"S_PALMTREE_TRUNK", 0, SPR_BSZ8, 4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_PALMTREE_TOP", 0, SPR_BSZ8, 5, -1, {A_ConnectToGround},     MT_PALMTREE_TRUNK, 0, S_NULL, 0},
+	{"BSZTALLFLOWER_RED", 0, SPR_BSZ1, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZTALLFLOWER_PURPLE", 0, SPR_BSZ1, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZTALLFLOWER_BLUE", 0, SPR_BSZ1, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZTALLFLOWER_CYAN", 0, SPR_BSZ1, 3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZTALLFLOWER_YELLOW", 0, SPR_BSZ1, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZTALLFLOWER_ORANGE", 0, SPR_BSZ1, 5, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZFLOWER_RED", 0, SPR_BSZ2, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZFLOWER_PURPLE", 0, SPR_BSZ2, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZFLOWER_BLUE", 0, SPR_BSZ2, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZFLOWER_CYAN", 0, SPR_BSZ2, 3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZFLOWER_YELLOW", 0, SPR_BSZ2, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZFLOWER_ORANGE", 0, SPR_BSZ2, 5, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZSHORTFLOWER_RED", 0, SPR_BSZ3, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZSHORTFLOWER_PURPLE", 0, SPR_BSZ3, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZSHORTFLOWER_BLUE", 0, SPR_BSZ3, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZSHORTFLOWER_CYAN", 0, SPR_BSZ3, 3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZSHORTFLOWER_YELLOW", 0, SPR_BSZ3, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZSHORTFLOWER_ORANGE", 0, SPR_BSZ3, 5, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZTULIP_RED", 0, SPR_BST1, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
+	{"BSZTULIP_PURPLE", 0, SPR_BST2, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
+	{"BSZTULIP_BLUE", 0, SPR_BST3, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
+	{"BSZTULIP_CYAN", 0, SPR_BST4, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
+	{"BSZTULIP_YELLOW", 0, SPR_BST5, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
+	{"BSZTULIP_ORANGE", 0, SPR_BST6, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL, 0},
+	{"BSZCLUSTER_RED", 0, SPR_BSZ5, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZCLUSTER_PURPLE", 0, SPR_BSZ5, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZCLUSTER_BLUE", 0, SPR_BSZ5, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZCLUSTER_CYAN", 0, SPR_BSZ5, 3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZCLUSTER_YELLOW", 0, SPR_BSZ5, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZCLUSTER_ORANGE", 0, SPR_BSZ5, 5, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZBUSH_RED", 0, SPR_BSZ6, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZBUSH_PURPLE", 0, SPR_BSZ6, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZBUSH_BLUE", 0, SPR_BSZ6, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZBUSH_CYAN", 0, SPR_BSZ6, 3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZBUSH_YELLOW", 0, SPR_BSZ6, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZBUSH_ORANGE", 0, SPR_BSZ6, 5, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZVINE_RED", 0, SPR_BSZ7, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZVINE_PURPLE", 0, SPR_BSZ7, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZVINE_BLUE", 0, SPR_BSZ7, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZVINE_CYAN", 0, SPR_BSZ7, 3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZVINE_YELLOW", 0, SPR_BSZ7, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZVINE_ORANGE", 0, SPR_BSZ7, 5, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZSHRUB", 0, SPR_BSZ8, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BSZCLOVER", 0, SPR_BSZ8, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BIG_PALMTREE_TRUNK", 0, SPR_BSZ8, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BIG_PALMTREE_TOP", 0, SPR_BSZ8, 3, -1, {A_ConnectToGround}, MT_BIG_PALMTREE_TRUNK, 0, S_NULL, 0},
+	{"PALMTREE_TRUNK", 0, SPR_BSZ8, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"PALMTREE_TOP", 0, SPR_BSZ8, 5, -1, {A_ConnectToGround},     MT_PALMTREE_TRUNK, 0, S_NULL, 0},
 
 	// Disco ball
-	{"S_DBALL1", 0, SPR_DBAL, FF_FULLBRIGHT,   5, {NULL}, 0, 0, S_DBALL2, 0},
-	{"S_DBALL2", 0, SPR_DBAL, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_DBALL3, 0},
-	{"S_DBALL3", 0, SPR_DBAL, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_DBALL4, 0},
-	{"S_DBALL4", 0, SPR_DBAL, FF_FULLBRIGHT|3, 5, {NULL}, 0, 0, S_DBALL5, 0},
-	{"S_DBALL5", 0, SPR_DBAL, FF_FULLBRIGHT|4, 5, {NULL}, 0, 0, S_DBALL6, 0},
-	{"S_DBALL6", 0, SPR_DBAL, FF_FULLBRIGHT|5, 5, {NULL}, 0, 0, S_DBALL1, 0},
+	{"DBALL1", 0, SPR_DBAL, FF_FULLBRIGHT,   5, {NULL}, 0, 0, S_DBALL2, 0},
+	{"DBALL2", 0, SPR_DBAL, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_DBALL3, 0},
+	{"DBALL3", 0, SPR_DBAL, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_DBALL4, 0},
+	{"DBALL4", 0, SPR_DBAL, FF_FULLBRIGHT|3, 5, {NULL}, 0, 0, S_DBALL5, 0},
+	{"DBALL5", 0, SPR_DBAL, FF_FULLBRIGHT|4, 5, {NULL}, 0, 0, S_DBALL6, 0},
+	{"DBALL6", 0, SPR_DBAL, FF_FULLBRIGHT|5, 5, {NULL}, 0, 0, S_DBALL1, 0},
 
-	{"S_EGGSTATUE2", 0, SPR_ESTA, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EGGSTATUE2", 0, SPR_ESTA, 1, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Shield Orb
-	{"S_ARMA1", 0, SPR_ARMA, FF_TRANS40   , 2, {NULL}, 0, 0, S_ARMA2 , 0},
-	{"S_ARMA2", 0, SPR_ARMA, FF_TRANS40| 1, 2, {NULL}, 0, 0, S_ARMA3 , 0},
-	{"S_ARMA3", 0, SPR_ARMA, FF_TRANS40| 2, 2, {NULL}, 0, 0, S_ARMA4 , 0},
-	{"S_ARMA4", 0, SPR_ARMA, FF_TRANS40| 3, 2, {NULL}, 0, 0, S_ARMA5 , 0},
-	{"S_ARMA5", 0, SPR_ARMA, FF_TRANS40| 4, 2, {NULL}, 0, 0, S_ARMA6 , 0},
-	{"S_ARMA6", 0, SPR_ARMA, FF_TRANS40| 5, 2, {NULL}, 0, 0, S_ARMA7 , 0},
-	{"S_ARMA7", 0, SPR_ARMA, FF_TRANS40| 6, 2, {NULL}, 0, 0, S_ARMA8 , 0},
-	{"S_ARMA8", 0, SPR_ARMA, FF_TRANS40| 7, 2, {NULL}, 0, 0, S_ARMA9 , 0},
-	{"S_ARMA9", 0, SPR_ARMA, FF_TRANS40| 8, 2, {NULL}, 0, 0, S_ARMA10, 0},
-	{"S_ARMA10", 0, SPR_ARMA, FF_TRANS40| 9, 2, {NULL}, 0, 0, S_ARMA11, 0},
-	{"S_ARMA11", 0, SPR_ARMA, FF_TRANS40|10, 2, {NULL}, 0, 0, S_ARMA12, 0},
-	{"S_ARMA12", 0, SPR_ARMA, FF_TRANS40|11, 2, {NULL}, 0, 0, S_ARMA13, 0},
-	{"S_ARMA13", 0, SPR_ARMA, FF_TRANS40|12, 2, {NULL}, 0, 0, S_ARMA14, 0},
-	{"S_ARMA14", 0, SPR_ARMA, FF_TRANS40|13, 2, {NULL}, 0, 0, S_ARMA15, 0},
-	{"S_ARMA15", 0, SPR_ARMA, FF_TRANS40|14, 2, {NULL}, 0, 0, S_ARMA16, 0},
-	{"S_ARMA16", 0, SPR_ARMA, FF_TRANS40|15, 2, {NULL}, 0, 0, S_ARMA1 , 0},
-
-	{"S_ARMF1", 0, SPR_ARMF, FF_FULLBRIGHT   , 2, {NULL}, 0, 0, S_ARMF2 , 0},
-	{"S_ARMF2", 0, SPR_ARMF, FF_FULLBRIGHT| 1, 2, {NULL}, 0, 0, S_ARMF3 , 0},
-	{"S_ARMF3", 0, SPR_ARMF, FF_FULLBRIGHT| 2, 2, {NULL}, 0, 0, S_ARMF4 , 0},
-	{"S_ARMF4", 0, SPR_ARMF, FF_FULLBRIGHT| 3, 2, {NULL}, 0, 0, S_ARMF5 , 0},
-	{"S_ARMF5", 0, SPR_ARMF, FF_FULLBRIGHT| 4, 2, {NULL}, 0, 0, S_ARMF6 , 0},
-	{"S_ARMF6", 0, SPR_ARMF, FF_FULLBRIGHT| 5, 2, {NULL}, 0, 0, S_ARMF7 , 0},
-	{"S_ARMF7", 0, SPR_ARMF, FF_FULLBRIGHT| 6, 2, {NULL}, 0, 0, S_ARMF8 , 0},
-	{"S_ARMF8", 0, SPR_ARMF, FF_FULLBRIGHT| 7, 2, {NULL}, 0, 0, S_ARMF9 , 0},
-	{"S_ARMF9", 0, SPR_ARMF, FF_FULLBRIGHT| 8, 2, {NULL}, 0, 0, S_ARMF10, 0},
-	{"S_ARMF10", 0, SPR_ARMF, FF_FULLBRIGHT| 9, 2, {NULL}, 0, 0, S_ARMF11, 0},
-	{"S_ARMF11", 0, SPR_ARMF, FF_FULLBRIGHT|10, 2, {NULL}, 0, 0, S_ARMF12, 0},
-	{"S_ARMF12", 0, SPR_ARMF, FF_FULLBRIGHT|11, 2, {NULL}, 0, 0, S_ARMF13, 0},
-	{"S_ARMF13", 0, SPR_ARMF, FF_FULLBRIGHT|12, 2, {NULL}, 0, 0, S_ARMF14, 0},
-	{"S_ARMF14", 0, SPR_ARMF, FF_FULLBRIGHT|13, 2, {NULL}, 0, 0, S_ARMF15, 0},
-	{"S_ARMF15", 0, SPR_ARMF, FF_FULLBRIGHT|14, 2, {NULL}, 0, 0, S_ARMF16, 0},
-	{"S_ARMF16", 0, SPR_ARMF, FF_FULLBRIGHT|15, 2, {NULL}, 0, 0, S_ARMF17, 0},
-	{"S_ARMF17", 0, SPR_ARMB, FF_FULLBRIGHT   , 2, {NULL}, 0, 0, S_ARMF18, 0},
-	{"S_ARMF18", 0, SPR_ARMB, FF_FULLBRIGHT| 1, 2, {NULL}, 0, 0, S_ARMF19, 0},
-	{"S_ARMF19", 0, SPR_ARMB, FF_FULLBRIGHT| 2, 2, {NULL}, 0, 0, S_ARMF20, 0},
-	{"S_ARMF20", 0, SPR_ARMB, FF_FULLBRIGHT| 3, 2, {NULL}, 0, 0, S_ARMF21, 0},
-	{"S_ARMF21", 0, SPR_ARMB, FF_FULLBRIGHT| 4, 2, {NULL}, 0, 0, S_ARMF22, 0},
-	{"S_ARMF22", 0, SPR_ARMB, FF_FULLBRIGHT| 5, 2, {NULL}, 0, 0, S_ARMF23, 0},
-	{"S_ARMF23", 0, SPR_ARMB, FF_FULLBRIGHT| 6, 2, {NULL}, 0, 0, S_ARMF24, 0},
-	{"S_ARMF24", 0, SPR_ARMB, FF_FULLBRIGHT| 7, 2, {NULL}, 0, 0, S_ARMF25, 0},
-	{"S_ARMF25", 0, SPR_ARMB, FF_FULLBRIGHT| 8, 2, {NULL}, 0, 0, S_ARMF26, 0},
-	{"S_ARMF26", 0, SPR_ARMB, FF_FULLBRIGHT| 9, 2, {NULL}, 0, 0, S_ARMF27, 0},
-	{"S_ARMF27", 0, SPR_ARMB, FF_FULLBRIGHT|10, 2, {NULL}, 0, 0, S_ARMF28, 0},
-	{"S_ARMF28", 0, SPR_ARMB, FF_FULLBRIGHT|11, 2, {NULL}, 0, 0, S_ARMF29, 0},
-	{"S_ARMF29", 0, SPR_ARMB, FF_FULLBRIGHT|12, 2, {NULL}, 0, 0, S_ARMF30, 0},
-	{"S_ARMF30", 0, SPR_ARMB, FF_FULLBRIGHT|13, 2, {NULL}, 0, 0, S_ARMF31, 0},
-	{"S_ARMF31", 0, SPR_ARMB, FF_FULLBRIGHT|14, 2, {NULL}, 0, 0, S_ARMF32, 0},
-	{"S_ARMF32", 0, SPR_ARMB, FF_FULLBRIGHT|15, 2, {NULL}, 0, 0, S_ARMF1 , 0},
-
-	{"S_ARMB1", 0, SPR_ARMB, FF_FULLBRIGHT   , 2, {NULL}, 1, 0, S_ARMB2 , 0},
-	{"S_ARMB2", 0, SPR_ARMB, FF_FULLBRIGHT| 1, 2, {NULL}, 1, 0, S_ARMB3 , 0},
-	{"S_ARMB3", 0, SPR_ARMB, FF_FULLBRIGHT| 2, 2, {NULL}, 1, 0, S_ARMB4 , 0},
-	{"S_ARMB4", 0, SPR_ARMB, FF_FULLBRIGHT| 3, 2, {NULL}, 1, 0, S_ARMB5 , 0},
-	{"S_ARMB5", 0, SPR_ARMB, FF_FULLBRIGHT| 4, 2, {NULL}, 1, 0, S_ARMB6 , 0},
-	{"S_ARMB6", 0, SPR_ARMB, FF_FULLBRIGHT| 5, 2, {NULL}, 1, 0, S_ARMB7 , 0},
-	{"S_ARMB7", 0, SPR_ARMB, FF_FULLBRIGHT| 6, 2, {NULL}, 1, 0, S_ARMB8 , 0},
-	{"S_ARMB8", 0, SPR_ARMB, FF_FULLBRIGHT| 7, 2, {NULL}, 1, 0, S_ARMB9 , 0},
-	{"S_ARMB9", 0, SPR_ARMB, FF_FULLBRIGHT| 8, 2, {NULL}, 1, 0, S_ARMB10, 0},
-	{"S_ARMB10", 0, SPR_ARMB, FF_FULLBRIGHT| 9, 2, {NULL}, 1, 0, S_ARMB11, 0},
-	{"S_ARMB11", 0, SPR_ARMB, FF_FULLBRIGHT|10, 2, {NULL}, 1, 0, S_ARMB12, 0},
-	{"S_ARMB12", 0, SPR_ARMB, FF_FULLBRIGHT|11, 2, {NULL}, 1, 0, S_ARMB13, 0},
-	{"S_ARMB13", 0, SPR_ARMB, FF_FULLBRIGHT|12, 2, {NULL}, 1, 0, S_ARMB14, 0},
-	{"S_ARMB14", 0, SPR_ARMB, FF_FULLBRIGHT|13, 2, {NULL}, 1, 0, S_ARMB15, 0},
-	{"S_ARMB15", 0, SPR_ARMB, FF_FULLBRIGHT|14, 2, {NULL}, 1, 0, S_ARMB16, 0},
-	{"S_ARMB16", 0, SPR_ARMB, FF_FULLBRIGHT|15, 2, {NULL}, 1, 0, S_ARMB17, 0},
-	{"S_ARMB17", 0, SPR_ARMF, FF_FULLBRIGHT   , 2, {NULL}, 1, 0, S_ARMB18, 0},
-	{"S_ARMB18", 0, SPR_ARMF, FF_FULLBRIGHT| 1, 2, {NULL}, 1, 0, S_ARMB19, 0},
-	{"S_ARMB19", 0, SPR_ARMF, FF_FULLBRIGHT| 2, 2, {NULL}, 1, 0, S_ARMB20, 0},
-	{"S_ARMB20", 0, SPR_ARMF, FF_FULLBRIGHT| 3, 2, {NULL}, 1, 0, S_ARMB21, 0},
-	{"S_ARMB21", 0, SPR_ARMF, FF_FULLBRIGHT| 4, 2, {NULL}, 1, 0, S_ARMB22, 0},
-	{"S_ARMB22", 0, SPR_ARMF, FF_FULLBRIGHT| 5, 2, {NULL}, 1, 0, S_ARMB23, 0},
-	{"S_ARMB23", 0, SPR_ARMF, FF_FULLBRIGHT| 6, 2, {NULL}, 1, 0, S_ARMB24, 0},
-	{"S_ARMB24", 0, SPR_ARMF, FF_FULLBRIGHT| 7, 2, {NULL}, 1, 0, S_ARMB25, 0},
-	{"S_ARMB25", 0, SPR_ARMF, FF_FULLBRIGHT| 8, 2, {NULL}, 1, 0, S_ARMB26, 0},
-	{"S_ARMB26", 0, SPR_ARMF, FF_FULLBRIGHT| 9, 2, {NULL}, 1, 0, S_ARMB27, 0},
-	{"S_ARMB27", 0, SPR_ARMF, FF_FULLBRIGHT|10, 2, {NULL}, 1, 0, S_ARMB28, 0},
-	{"S_ARMB28", 0, SPR_ARMF, FF_FULLBRIGHT|11, 2, {NULL}, 1, 0, S_ARMB29, 0},
-	{"S_ARMB29", 0, SPR_ARMF, FF_FULLBRIGHT|12, 2, {NULL}, 1, 0, S_ARMB30, 0},
-	{"S_ARMB30", 0, SPR_ARMF, FF_FULLBRIGHT|13, 2, {NULL}, 1, 0, S_ARMB31, 0},
-	{"S_ARMB31", 0, SPR_ARMF, FF_FULLBRIGHT|14, 2, {NULL}, 1, 0, S_ARMB32, 0},
-	{"S_ARMB32", 0, SPR_ARMF, FF_FULLBRIGHT|15, 2, {NULL}, 1, 0, S_ARMB1 , 0},
-
-	{"S_WIND1", 0, SPR_WIND, FF_TRANS70  , 2, {NULL}, 0, 0, S_WIND2, 0},
-	{"S_WIND2", 0, SPR_WIND, FF_TRANS70|1, 2, {NULL}, 0, 0, S_WIND3, 0},
-	{"S_WIND3", 0, SPR_WIND, FF_TRANS70|2, 2, {NULL}, 0, 0, S_WIND4, 0},
-	{"S_WIND4", 0, SPR_WIND, FF_TRANS70|3, 2, {NULL}, 0, 0, S_WIND5, 0},
-	{"S_WIND5", 0, SPR_WIND, FF_TRANS70|4, 2, {NULL}, 0, 0, S_WIND6, 0},
-	{"S_WIND6", 0, SPR_WIND, FF_TRANS70|5, 2, {NULL}, 0, 0, S_WIND7, 0},
-	{"S_WIND7", 0, SPR_WIND, FF_TRANS70|6, 2, {NULL}, 0, 0, S_WIND8, 0},
-	{"S_WIND8", 0, SPR_WIND, FF_TRANS70|7, 2, {NULL}, 0, 0, S_WIND1, 0},
-
-	{"S_MAGN1", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40   , 2, {NULL}, 0, 0, S_MAGN2 , 0},
-	{"S_MAGN2", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 1, 2, {NULL}, 0, 0, S_MAGN3 , 0},
-	{"S_MAGN3", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 2, 2, {NULL}, 0, 0, S_MAGN4 , 0},
-	{"S_MAGN4", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 3, 2, {NULL}, 0, 0, S_MAGN5 , 0},
-	{"S_MAGN5", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 4, 2, {NULL}, 0, 0, S_MAGN6 , 0},
-	{"S_MAGN6", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 5, 2, {NULL}, 0, 0, S_MAGN7 , 0},
-	{"S_MAGN7", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 6, 2, {NULL}, 0, 0, S_MAGN8 , 0},
-	{"S_MAGN8", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 7, 2, {NULL}, 0, 0, S_MAGN9 , 0},
-	{"S_MAGN9", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 8, 2, {NULL}, 0, 0, S_MAGN10, 0},
-	{"S_MAGN10", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 9, 2, {NULL}, 0, 0, S_MAGN11, 0},
-	{"S_MAGN11", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40|10, 2, {NULL}, 0, 0, S_MAGN12, 0},
-	{"S_MAGN12", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40|11, 2, {NULL}, 0, 0, S_MAGN1 , 0},
-
-	{"S_MAGN13", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS10|12, 2, {NULL}, 0, 0, S_MAGN1 , 0},
-
-	{"S_FORC1", 0, SPR_FORC, FF_TRANS50  , 3, {NULL}, 0, 0, S_FORC2 , 0},
-	{"S_FORC2", 0, SPR_FORC, FF_TRANS50|1, 3, {NULL}, 0, 0, S_FORC3 , 0},
-	{"S_FORC3", 0, SPR_FORC, FF_TRANS50|2, 3, {NULL}, 0, 0, S_FORC4 , 0},
-	{"S_FORC4", 0, SPR_FORC, FF_TRANS50|3, 3, {NULL}, 0, 0, S_FORC5 , 0},
-	{"S_FORC5", 0, SPR_FORC, FF_TRANS50|4, 3, {NULL}, 0, 0, S_FORC6 , 0},
-	{"S_FORC6", 0, SPR_FORC, FF_TRANS50|5, 3, {NULL}, 0, 0, S_FORC7 , 0},
-	{"S_FORC7", 0, SPR_FORC, FF_TRANS50|6, 3, {NULL}, 0, 0, S_FORC8 , 0},
-	{"S_FORC8", 0, SPR_FORC, FF_TRANS50|7, 3, {NULL}, 0, 0, S_FORC9 , 0},
-	{"S_FORC9", 0, SPR_FORC, FF_TRANS50|8, 3, {NULL}, 0, 0, S_FORC10, 0},
-	{"S_FORC10", 0, SPR_FORC, FF_TRANS50|9, 3, {NULL}, 0, 0, S_FORC1 , 0},
-
-	{"S_FORC11", 0, SPR_FORC, FF_TRANS50|10, 3, {NULL}, 0, 0, S_FORC12, 0},
-	{"S_FORC12", 0, SPR_FORC, FF_TRANS50|11, 3, {NULL}, 0, 0, S_FORC13, 0},
-	{"S_FORC13", 0, SPR_FORC, FF_TRANS50|12, 3, {NULL}, 0, 0, S_FORC14, 0},
-	{"S_FORC14", 0, SPR_FORC, FF_TRANS50|13, 3, {NULL}, 0, 0, S_FORC15, 0},
-	{"S_FORC15", 0, SPR_FORC, FF_TRANS50|14, 3, {NULL}, 0, 0, S_FORC16, 0},
-	{"S_FORC16", 0, SPR_FORC, FF_TRANS50|15, 3, {NULL}, 0, 0, S_FORC17, 0},
-	{"S_FORC17", 0, SPR_FORC, FF_TRANS50|16, 3, {NULL}, 0, 0, S_FORC18, 0},
-	{"S_FORC18", 0, SPR_FORC, FF_TRANS50|17, 3, {NULL}, 0, 0, S_FORC19, 0},
-	{"S_FORC19", 0, SPR_FORC, FF_TRANS50|18, 3, {NULL}, 0, 0, S_FORC20, 0},
-	{"S_FORC20", 0, SPR_FORC, FF_TRANS50|19, 3, {NULL}, 0, 0, S_FORC11, 0},
-
-	{"S_FORC21", 0, SPR_FORC, FF_TRANS50|20, -1, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_ELEM1", 0, SPR_ELEM, FF_TRANS50   , 4, {NULL}, 0, 0, S_ELEM2 , 0},
-	{"S_ELEM2", 0, SPR_ELEM, FF_TRANS50| 1, 4, {NULL}, 0, 0, S_ELEM3 , 0},
-	{"S_ELEM3", 0, SPR_ELEM, FF_TRANS50| 2, 4, {NULL}, 0, 0, S_ELEM4 , 0},
-	{"S_ELEM4", 0, SPR_ELEM, FF_TRANS50| 3, 4, {NULL}, 0, 0, S_ELEM5 , 0},
-	{"S_ELEM5", 0, SPR_ELEM, FF_TRANS50| 4, 4, {NULL}, 0, 0, S_ELEM6 , 0},
-	{"S_ELEM6", 0, SPR_ELEM, FF_TRANS50| 5, 4, {NULL}, 0, 0, S_ELEM7 , 0},
-	{"S_ELEM7", 0, SPR_ELEM, FF_TRANS50| 6, 4, {NULL}, 0, 0, S_ELEM8 , 0},
-	{"S_ELEM8", 0, SPR_ELEM, FF_TRANS50| 7, 4, {NULL}, 0, 0, S_ELEM9 , 0},
-	{"S_ELEM9", 0, SPR_ELEM, FF_TRANS50| 8, 4, {NULL}, 0, 0, S_ELEM10, 0},
-	{"S_ELEM10", 0, SPR_ELEM, FF_TRANS50| 9, 4, {NULL}, 0, 0, S_ELEM11, 0},
-	{"S_ELEM11", 0, SPR_ELEM, FF_TRANS50|10, 4, {NULL}, 0, 0, S_ELEM12, 0},
-	{"S_ELEM12", 0, SPR_ELEM, FF_TRANS50|11, 4, {NULL}, 0, 0, S_ELEM1 , 0},
-
-	{"S_ELEM13", 0, SPR_NULL,             0, 1, {NULL}, 0, 0, S_ELEM14, 0},
-	{"S_ELEM14", 0, SPR_ELEM, FF_TRANS50|11, 1, {NULL}, 0, 0, S_ELEM1 , 0},
-
-	{"S_ELEMF1", 0, SPR_ELEM, FF_FULLBRIGHT|12, 3, {NULL}, 0, 0, S_ELEMF2 , 0},
-	{"S_ELEMF2", 0, SPR_ELEM, FF_FULLBRIGHT|13, 3, {NULL}, 0, 0, S_ELEMF3 , 0},
-	{"S_ELEMF3", 0, SPR_ELEM, FF_FULLBRIGHT|14, 3, {NULL}, 0, 0, S_ELEMF4 , 0},
-	{"S_ELEMF4", 0, SPR_ELEM, FF_FULLBRIGHT|15, 3, {NULL}, 0, 0, S_ELEMF5 , 0},
-	{"S_ELEMF5", 0, SPR_ELEM, FF_FULLBRIGHT|16, 3, {NULL}, 0, 0, S_ELEMF6 , 0},
-	{"S_ELEMF6", 0, SPR_ELEM, FF_FULLBRIGHT|17, 3, {NULL}, 0, 0, S_ELEMF7 , 0},
-	{"S_ELEMF7", 0, SPR_ELEM, FF_FULLBRIGHT|18, 3, {NULL}, 0, 0, S_ELEMF8 , 0},
-	{"S_ELEMF8", 0, SPR_ELEM, FF_FULLBRIGHT|19, 3, {NULL}, 0, 0, S_ELEMF1 , 0},
-
-	{"S_ELEMF9", 0, SPR_ELEM, FF_FULLBRIGHT|20, 1, {NULL}, 0, 0, S_ELEMF10, 0},
-	{"S_ELEMF10", 0, SPR_NULL, 0,                1, {NULL}, 0, 0, S_ELEMF1 , 0},
-
-	{"S_PITY1", 0, SPR_PITY, FF_TRANS30   , 2, {NULL}, 0, 0, S_PITY2, 0},
-	{"S_PITY2", 0, SPR_PITY, FF_TRANS30| 1, 2, {NULL}, 0, 0, S_PITY3, 0},
-	{"S_PITY3", 0, SPR_PITY, FF_TRANS30| 2, 2, {NULL}, 0, 0, S_PITY4, 0},
-	{"S_PITY4", 0, SPR_PITY, FF_TRANS30| 3, 2, {NULL}, 0, 0, S_PITY5, 0},
-	{"S_PITY5", 0, SPR_PITY, FF_TRANS30| 4, 2, {NULL}, 0, 0, S_PITY6, 0},
-	{"S_PITY6", 0, SPR_PITY, FF_TRANS30| 5, 2, {NULL}, 0, 0, S_PITY7, 0},
-	{"S_PITY7", 0, SPR_PITY, FF_TRANS30| 6, 2, {NULL}, 0, 0, S_PITY8, 0},
-	{"S_PITY8", 0, SPR_PITY, FF_TRANS30| 7, 2, {NULL}, 0, 0, S_PITY9, 0},
-	{"S_PITY9", 0, SPR_PITY, FF_TRANS30| 8, 2, {NULL}, 0, 0, S_PITY10, 0},
-	{"S_PITY10", 0, SPR_PITY, FF_TRANS30| 9, 2, {NULL}, 0, 0, S_PITY11, 0},
-	{"S_PITY11", 0, SPR_PITY, FF_TRANS30|10, 2, {NULL}, 0, 0, S_PITY12, 0},
-	{"S_PITY12", 0, SPR_PITY, FF_TRANS30|11, 2, {NULL}, 0, 0, S_PITY1, 0},
-
-	{"S_FIRS1", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40  , 2, {NULL}, 0, 0, S_FIRS2, 0},
-	{"S_FIRS2", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|1, 2, {NULL}, 0, 0, S_FIRS3, 0},
-	{"S_FIRS3", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|2, 2, {NULL}, 0, 0, S_FIRS4, 0},
-	{"S_FIRS4", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|3, 2, {NULL}, 0, 0, S_FIRS5, 0},
-	{"S_FIRS5", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|4, 2, {NULL}, 0, 0, S_FIRS6, 0},
-	{"S_FIRS6", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|5, 2, {NULL}, 0, 0, S_FIRS7, 0},
-	{"S_FIRS7", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|6, 2, {NULL}, 0, 0, S_FIRS8, 0},
-	{"S_FIRS8", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|7, 2, {NULL}, 0, 0, S_FIRS9, 0},
-	{"S_FIRS9", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|8, 2, {NULL}, 0, 0, S_FIRS1, 0},
-
-	{"S_FIRS10", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|18, 1, {NULL}, 0, 0, S_FIRS11, 0},
-	{"S_FIRS11", 0, SPR_NULL, 0,                           1, {NULL}, 0, 0, S_FIRS1 , 0},
-
-	{"S_FIRSB1", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40| 9, 2, {NULL}, 0, 0, S_FIRSB2, 0},
-	{"S_FIRSB2", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|10, 2, {NULL}, 0, 0, S_FIRSB3, 0},
-	{"S_FIRSB3", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|11, 2, {NULL}, 0, 0, S_FIRSB4, 0},
-	{"S_FIRSB4", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|12, 2, {NULL}, 0, 0, S_FIRSB5, 0},
-	{"S_FIRSB5", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|13, 2, {NULL}, 0, 0, S_FIRSB6, 0},
-	{"S_FIRSB6", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|14, 2, {NULL}, 0, 0, S_FIRSB7, 0},
-	{"S_FIRSB7", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|15, 2, {NULL}, 0, 0, S_FIRSB8, 0},
-	{"S_FIRSB8", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|16, 2, {NULL}, 0, 0, S_FIRSB9, 0},
-	{"S_FIRSB9", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|17, 2, {NULL}, 0, 0, S_FIRSB1, 0},
-
-	{"S_FIRSB10", 0, SPR_NULL, 0,                           2, {NULL}, 0, 0, S_FIRSB1 , 0},
-
-	{"S_BUBS1", 0, SPR_BUBS, FF_TRANS30  , 3, {NULL}, 0, 0, S_BUBS2, 0},
-	{"S_BUBS2", 0, SPR_BUBS, FF_TRANS30|1, 3, {NULL}, 0, 0, S_BUBS3, 0},
-	{"S_BUBS3", 0, SPR_BUBS, FF_TRANS30|2, 3, {NULL}, 0, 0, S_BUBS4, 0},
-	{"S_BUBS4", 0, SPR_BUBS, FF_TRANS30|3, 3, {NULL}, 0, 0, S_BUBS5, 0},
-	{"S_BUBS5", 0, SPR_BUBS, FF_TRANS30|4, 3, {NULL}, 0, 0, S_BUBS6, 0},
-	{"S_BUBS6", 0, SPR_BUBS, FF_TRANS30|5, 3, {NULL}, 0, 0, S_BUBS7, 0},
-	{"S_BUBS7", 0, SPR_BUBS, FF_TRANS30|6, 3, {NULL}, 0, 0, S_BUBS8, 0},
-	{"S_BUBS8", 0, SPR_BUBS, FF_TRANS30|7, 3, {NULL}, 0, 0, S_BUBS9, 0},
-	{"S_BUBS9", 0, SPR_BUBS, FF_TRANS30|8, 3, {NULL}, 0, 0, S_BUBS1, 0},
-
-	{"S_BUBS10", 0, SPR_NULL, 0,   3, {NULL}, 0, 0, S_BUBS1, 0},
-	{"S_BUBS11", 0, SPR_NULL, 0, 4*3, {NULL}, 0, 0, S_BUBS1, 0},
-
-	{"S_BUBSB1", 0, SPR_BUBS, FF_TRANS30| 9, 3, {NULL}, 0, 0, S_BUBSB2, 0},
-	{"S_BUBSB2", 0, SPR_BUBS, FF_TRANS30|10, 3, {NULL}, 0, 0, S_BUBSB3, 0},
-	{"S_BUBSB3", 0, SPR_BUBS, FF_TRANS30|11, 3, {NULL}, 0, 0, S_BUBSB4, 0},
-	{"S_BUBSB4", 0, SPR_BUBS, FF_TRANS30|10, 3, {NULL}, 0, 0, S_BUBSB1, 0},
-
-	{"S_BUBSB5", 0, SPR_BUBS, FF_TRANS30|12, 3, {NULL}, 0, 0, S_BUBSB3, 0},
-	{"S_BUBSB6", 0, SPR_BUBS, FF_TRANS30|13, 3, {NULL}, 0, 0, S_BUBSB5, 0},
-
-	{"S_ZAPS1", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20   ,   2, {NULL}, 0, 0, S_ZAPS2 , 0},
-	{"S_ZAPS2", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 1,   2, {NULL}, 0, 0, S_ZAPS3 , 0},
-	{"S_ZAPS3", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 2,   2, {NULL}, 0, 0, S_ZAPS4 , 0},
-	{"S_ZAPS4", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 3,   2, {NULL}, 0, 0, S_ZAPS5 , 0},
-	{"S_ZAPS5", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 4,   2, {NULL}, 0, 0, S_ZAPS6 , 0},
-	{"S_ZAPS6", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 5,   2, {NULL}, 0, 0, S_ZAPS7 , 0},
-	{"S_ZAPS7", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 6,   2, {NULL}, 0, 0, S_ZAPS8 , 0},
-	{"S_ZAPS8", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 7,   2, {NULL}, 0, 0, S_ZAPS9 , 0},
-	{"S_ZAPS9", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 8,   2, {NULL}, 0, 0, S_ZAPS10, 0},
-	{"S_ZAPS10", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 9,   2, {NULL}, 0, 0, S_ZAPS11, 0},
-	{"S_ZAPS11", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20|10,   2, {NULL}, 0, 0, S_ZAPS12, 0},
-	{"S_ZAPS12", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20|11,   2, {NULL}, 0, 0, S_ZAPS13, 0},
-	{"S_ZAPS13", 0, SPR_NULL,                           0, 9*2, {NULL}, 0, 0, S_ZAPS14, 0},
-	{"S_ZAPS14", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 9,   2, {NULL}, 0, 0, S_ZAPS15, 0},
-	{"S_ZAPS15", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20|10,   2, {NULL}, 0, 0, S_ZAPS16, 0},
-	{"S_ZAPS16", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20|11,   2, {NULL}, 0, 0, S_ZAPS1 , 0},
-
-	{"S_ZAPSB1", 0, SPR_NULL,                           0, 12*2, {NULL}, 0, 0, S_ZAPSB2 , 0},
-	{"S_ZAPSB2", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 8,    2, {NULL}, 0, 0, S_ZAPSB3 , 0},
-	{"S_ZAPSB3", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 7,    2, {NULL}, 0, 0, S_ZAPSB4 , 0},
-	{"S_ZAPSB4", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 6,    2, {NULL}, 0, 0, S_ZAPSB5 , 0},
-	{"S_ZAPSB5", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 5,    2, {NULL}, 0, 0, S_ZAPSB6 , 0},
-	{"S_ZAPSB6", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 4,    2, {NULL}, 0, 0, S_ZAPSB7 , 0},
-	{"S_ZAPSB7", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 3,    2, {NULL}, 0, 0, S_ZAPSB8 , 0},
-	{"S_ZAPSB8", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 2,    2, {NULL}, 0, 0, S_ZAPSB9 , 0},
-	{"S_ZAPSB9", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 1,    2, {NULL}, 0, 0, S_ZAPSB10, 0},
-	{"S_ZAPSB10", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20   ,    2, {NULL}, 0, 0, S_ZAPSB11, 0},
-	{"S_ZAPSB11", 0, SPR_NULL,                           0, 15*2, {NULL}, 0, 0, S_ZAPSB2 , 0},
+	{"ARMA1", 0, SPR_ARMA, FF_TRANS40   , 2, {NULL}, 0, 0, S_ARMA2 , 0},
+	{"ARMA2", 0, SPR_ARMA, FF_TRANS40| 1, 2, {NULL}, 0, 0, S_ARMA3 , 0},
+	{"ARMA3", 0, SPR_ARMA, FF_TRANS40| 2, 2, {NULL}, 0, 0, S_ARMA4 , 0},
+	{"ARMA4", 0, SPR_ARMA, FF_TRANS40| 3, 2, {NULL}, 0, 0, S_ARMA5 , 0},
+	{"ARMA5", 0, SPR_ARMA, FF_TRANS40| 4, 2, {NULL}, 0, 0, S_ARMA6 , 0},
+	{"ARMA6", 0, SPR_ARMA, FF_TRANS40| 5, 2, {NULL}, 0, 0, S_ARMA7 , 0},
+	{"ARMA7", 0, SPR_ARMA, FF_TRANS40| 6, 2, {NULL}, 0, 0, S_ARMA8 , 0},
+	{"ARMA8", 0, SPR_ARMA, FF_TRANS40| 7, 2, {NULL}, 0, 0, S_ARMA9 , 0},
+	{"ARMA9", 0, SPR_ARMA, FF_TRANS40| 8, 2, {NULL}, 0, 0, S_ARMA10, 0},
+	{"ARMA10", 0, SPR_ARMA, FF_TRANS40| 9, 2, {NULL}, 0, 0, S_ARMA11, 0},
+	{"ARMA11", 0, SPR_ARMA, FF_TRANS40|10, 2, {NULL}, 0, 0, S_ARMA12, 0},
+	{"ARMA12", 0, SPR_ARMA, FF_TRANS40|11, 2, {NULL}, 0, 0, S_ARMA13, 0},
+	{"ARMA13", 0, SPR_ARMA, FF_TRANS40|12, 2, {NULL}, 0, 0, S_ARMA14, 0},
+	{"ARMA14", 0, SPR_ARMA, FF_TRANS40|13, 2, {NULL}, 0, 0, S_ARMA15, 0},
+	{"ARMA15", 0, SPR_ARMA, FF_TRANS40|14, 2, {NULL}, 0, 0, S_ARMA16, 0},
+	{"ARMA16", 0, SPR_ARMA, FF_TRANS40|15, 2, {NULL}, 0, 0, S_ARMA1 , 0},
+
+	{"ARMF1", 0, SPR_ARMF, FF_FULLBRIGHT   , 2, {NULL}, 0, 0, S_ARMF2 , 0},
+	{"ARMF2", 0, SPR_ARMF, FF_FULLBRIGHT| 1, 2, {NULL}, 0, 0, S_ARMF3 , 0},
+	{"ARMF3", 0, SPR_ARMF, FF_FULLBRIGHT| 2, 2, {NULL}, 0, 0, S_ARMF4 , 0},
+	{"ARMF4", 0, SPR_ARMF, FF_FULLBRIGHT| 3, 2, {NULL}, 0, 0, S_ARMF5 , 0},
+	{"ARMF5", 0, SPR_ARMF, FF_FULLBRIGHT| 4, 2, {NULL}, 0, 0, S_ARMF6 , 0},
+	{"ARMF6", 0, SPR_ARMF, FF_FULLBRIGHT| 5, 2, {NULL}, 0, 0, S_ARMF7 , 0},
+	{"ARMF7", 0, SPR_ARMF, FF_FULLBRIGHT| 6, 2, {NULL}, 0, 0, S_ARMF8 , 0},
+	{"ARMF8", 0, SPR_ARMF, FF_FULLBRIGHT| 7, 2, {NULL}, 0, 0, S_ARMF9 , 0},
+	{"ARMF9", 0, SPR_ARMF, FF_FULLBRIGHT| 8, 2, {NULL}, 0, 0, S_ARMF10, 0},
+	{"ARMF10", 0, SPR_ARMF, FF_FULLBRIGHT| 9, 2, {NULL}, 0, 0, S_ARMF11, 0},
+	{"ARMF11", 0, SPR_ARMF, FF_FULLBRIGHT|10, 2, {NULL}, 0, 0, S_ARMF12, 0},
+	{"ARMF12", 0, SPR_ARMF, FF_FULLBRIGHT|11, 2, {NULL}, 0, 0, S_ARMF13, 0},
+	{"ARMF13", 0, SPR_ARMF, FF_FULLBRIGHT|12, 2, {NULL}, 0, 0, S_ARMF14, 0},
+	{"ARMF14", 0, SPR_ARMF, FF_FULLBRIGHT|13, 2, {NULL}, 0, 0, S_ARMF15, 0},
+	{"ARMF15", 0, SPR_ARMF, FF_FULLBRIGHT|14, 2, {NULL}, 0, 0, S_ARMF16, 0},
+	{"ARMF16", 0, SPR_ARMF, FF_FULLBRIGHT|15, 2, {NULL}, 0, 0, S_ARMF17, 0},
+	{"ARMF17", 0, SPR_ARMB, FF_FULLBRIGHT   , 2, {NULL}, 0, 0, S_ARMF18, 0},
+	{"ARMF18", 0, SPR_ARMB, FF_FULLBRIGHT| 1, 2, {NULL}, 0, 0, S_ARMF19, 0},
+	{"ARMF19", 0, SPR_ARMB, FF_FULLBRIGHT| 2, 2, {NULL}, 0, 0, S_ARMF20, 0},
+	{"ARMF20", 0, SPR_ARMB, FF_FULLBRIGHT| 3, 2, {NULL}, 0, 0, S_ARMF21, 0},
+	{"ARMF21", 0, SPR_ARMB, FF_FULLBRIGHT| 4, 2, {NULL}, 0, 0, S_ARMF22, 0},
+	{"ARMF22", 0, SPR_ARMB, FF_FULLBRIGHT| 5, 2, {NULL}, 0, 0, S_ARMF23, 0},
+	{"ARMF23", 0, SPR_ARMB, FF_FULLBRIGHT| 6, 2, {NULL}, 0, 0, S_ARMF24, 0},
+	{"ARMF24", 0, SPR_ARMB, FF_FULLBRIGHT| 7, 2, {NULL}, 0, 0, S_ARMF25, 0},
+	{"ARMF25", 0, SPR_ARMB, FF_FULLBRIGHT| 8, 2, {NULL}, 0, 0, S_ARMF26, 0},
+	{"ARMF26", 0, SPR_ARMB, FF_FULLBRIGHT| 9, 2, {NULL}, 0, 0, S_ARMF27, 0},
+	{"ARMF27", 0, SPR_ARMB, FF_FULLBRIGHT|10, 2, {NULL}, 0, 0, S_ARMF28, 0},
+	{"ARMF28", 0, SPR_ARMB, FF_FULLBRIGHT|11, 2, {NULL}, 0, 0, S_ARMF29, 0},
+	{"ARMF29", 0, SPR_ARMB, FF_FULLBRIGHT|12, 2, {NULL}, 0, 0, S_ARMF30, 0},
+	{"ARMF30", 0, SPR_ARMB, FF_FULLBRIGHT|13, 2, {NULL}, 0, 0, S_ARMF31, 0},
+	{"ARMF31", 0, SPR_ARMB, FF_FULLBRIGHT|14, 2, {NULL}, 0, 0, S_ARMF32, 0},
+	{"ARMF32", 0, SPR_ARMB, FF_FULLBRIGHT|15, 2, {NULL}, 0, 0, S_ARMF1 , 0},
+
+	{"ARMB1", 0, SPR_ARMB, FF_FULLBRIGHT   , 2, {NULL}, 1, 0, S_ARMB2 , 0},
+	{"ARMB2", 0, SPR_ARMB, FF_FULLBRIGHT| 1, 2, {NULL}, 1, 0, S_ARMB3 , 0},
+	{"ARMB3", 0, SPR_ARMB, FF_FULLBRIGHT| 2, 2, {NULL}, 1, 0, S_ARMB4 , 0},
+	{"ARMB4", 0, SPR_ARMB, FF_FULLBRIGHT| 3, 2, {NULL}, 1, 0, S_ARMB5 , 0},
+	{"ARMB5", 0, SPR_ARMB, FF_FULLBRIGHT| 4, 2, {NULL}, 1, 0, S_ARMB6 , 0},
+	{"ARMB6", 0, SPR_ARMB, FF_FULLBRIGHT| 5, 2, {NULL}, 1, 0, S_ARMB7 , 0},
+	{"ARMB7", 0, SPR_ARMB, FF_FULLBRIGHT| 6, 2, {NULL}, 1, 0, S_ARMB8 , 0},
+	{"ARMB8", 0, SPR_ARMB, FF_FULLBRIGHT| 7, 2, {NULL}, 1, 0, S_ARMB9 , 0},
+	{"ARMB9", 0, SPR_ARMB, FF_FULLBRIGHT| 8, 2, {NULL}, 1, 0, S_ARMB10, 0},
+	{"ARMB10", 0, SPR_ARMB, FF_FULLBRIGHT| 9, 2, {NULL}, 1, 0, S_ARMB11, 0},
+	{"ARMB11", 0, SPR_ARMB, FF_FULLBRIGHT|10, 2, {NULL}, 1, 0, S_ARMB12, 0},
+	{"ARMB12", 0, SPR_ARMB, FF_FULLBRIGHT|11, 2, {NULL}, 1, 0, S_ARMB13, 0},
+	{"ARMB13", 0, SPR_ARMB, FF_FULLBRIGHT|12, 2, {NULL}, 1, 0, S_ARMB14, 0},
+	{"ARMB14", 0, SPR_ARMB, FF_FULLBRIGHT|13, 2, {NULL}, 1, 0, S_ARMB15, 0},
+	{"ARMB15", 0, SPR_ARMB, FF_FULLBRIGHT|14, 2, {NULL}, 1, 0, S_ARMB16, 0},
+	{"ARMB16", 0, SPR_ARMB, FF_FULLBRIGHT|15, 2, {NULL}, 1, 0, S_ARMB17, 0},
+	{"ARMB17", 0, SPR_ARMF, FF_FULLBRIGHT   , 2, {NULL}, 1, 0, S_ARMB18, 0},
+	{"ARMB18", 0, SPR_ARMF, FF_FULLBRIGHT| 1, 2, {NULL}, 1, 0, S_ARMB19, 0},
+	{"ARMB19", 0, SPR_ARMF, FF_FULLBRIGHT| 2, 2, {NULL}, 1, 0, S_ARMB20, 0},
+	{"ARMB20", 0, SPR_ARMF, FF_FULLBRIGHT| 3, 2, {NULL}, 1, 0, S_ARMB21, 0},
+	{"ARMB21", 0, SPR_ARMF, FF_FULLBRIGHT| 4, 2, {NULL}, 1, 0, S_ARMB22, 0},
+	{"ARMB22", 0, SPR_ARMF, FF_FULLBRIGHT| 5, 2, {NULL}, 1, 0, S_ARMB23, 0},
+	{"ARMB23", 0, SPR_ARMF, FF_FULLBRIGHT| 6, 2, {NULL}, 1, 0, S_ARMB24, 0},
+	{"ARMB24", 0, SPR_ARMF, FF_FULLBRIGHT| 7, 2, {NULL}, 1, 0, S_ARMB25, 0},
+	{"ARMB25", 0, SPR_ARMF, FF_FULLBRIGHT| 8, 2, {NULL}, 1, 0, S_ARMB26, 0},
+	{"ARMB26", 0, SPR_ARMF, FF_FULLBRIGHT| 9, 2, {NULL}, 1, 0, S_ARMB27, 0},
+	{"ARMB27", 0, SPR_ARMF, FF_FULLBRIGHT|10, 2, {NULL}, 1, 0, S_ARMB28, 0},
+	{"ARMB28", 0, SPR_ARMF, FF_FULLBRIGHT|11, 2, {NULL}, 1, 0, S_ARMB29, 0},
+	{"ARMB29", 0, SPR_ARMF, FF_FULLBRIGHT|12, 2, {NULL}, 1, 0, S_ARMB30, 0},
+	{"ARMB30", 0, SPR_ARMF, FF_FULLBRIGHT|13, 2, {NULL}, 1, 0, S_ARMB31, 0},
+	{"ARMB31", 0, SPR_ARMF, FF_FULLBRIGHT|14, 2, {NULL}, 1, 0, S_ARMB32, 0},
+	{"ARMB32", 0, SPR_ARMF, FF_FULLBRIGHT|15, 2, {NULL}, 1, 0, S_ARMB1 , 0},
+
+	{"WIND1", 0, SPR_WIND, FF_TRANS70  , 2, {NULL}, 0, 0, S_WIND2, 0},
+	{"WIND2", 0, SPR_WIND, FF_TRANS70|1, 2, {NULL}, 0, 0, S_WIND3, 0},
+	{"WIND3", 0, SPR_WIND, FF_TRANS70|2, 2, {NULL}, 0, 0, S_WIND4, 0},
+	{"WIND4", 0, SPR_WIND, FF_TRANS70|3, 2, {NULL}, 0, 0, S_WIND5, 0},
+	{"WIND5", 0, SPR_WIND, FF_TRANS70|4, 2, {NULL}, 0, 0, S_WIND6, 0},
+	{"WIND6", 0, SPR_WIND, FF_TRANS70|5, 2, {NULL}, 0, 0, S_WIND7, 0},
+	{"WIND7", 0, SPR_WIND, FF_TRANS70|6, 2, {NULL}, 0, 0, S_WIND8, 0},
+	{"WIND8", 0, SPR_WIND, FF_TRANS70|7, 2, {NULL}, 0, 0, S_WIND1, 0},
+
+	{"MAGN1", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40   , 2, {NULL}, 0, 0, S_MAGN2 , 0},
+	{"MAGN2", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 1, 2, {NULL}, 0, 0, S_MAGN3 , 0},
+	{"MAGN3", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 2, 2, {NULL}, 0, 0, S_MAGN4 , 0},
+	{"MAGN4", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 3, 2, {NULL}, 0, 0, S_MAGN5 , 0},
+	{"MAGN5", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 4, 2, {NULL}, 0, 0, S_MAGN6 , 0},
+	{"MAGN6", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 5, 2, {NULL}, 0, 0, S_MAGN7 , 0},
+	{"MAGN7", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 6, 2, {NULL}, 0, 0, S_MAGN8 , 0},
+	{"MAGN8", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 7, 2, {NULL}, 0, 0, S_MAGN9 , 0},
+	{"MAGN9", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 8, 2, {NULL}, 0, 0, S_MAGN10, 0},
+	{"MAGN10", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 9, 2, {NULL}, 0, 0, S_MAGN11, 0},
+	{"MAGN11", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40|10, 2, {NULL}, 0, 0, S_MAGN12, 0},
+	{"MAGN12", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40|11, 2, {NULL}, 0, 0, S_MAGN1 , 0},
+
+	{"MAGN13", 0, SPR_MAGN, FF_FULLBRIGHT|FF_TRANS10|12, 2, {NULL}, 0, 0, S_MAGN1 , 0},
+
+	{"FORC1", 0, SPR_FORC, FF_TRANS50  , 3, {NULL}, 0, 0, S_FORC2 , 0},
+	{"FORC2", 0, SPR_FORC, FF_TRANS50|1, 3, {NULL}, 0, 0, S_FORC3 , 0},
+	{"FORC3", 0, SPR_FORC, FF_TRANS50|2, 3, {NULL}, 0, 0, S_FORC4 , 0},
+	{"FORC4", 0, SPR_FORC, FF_TRANS50|3, 3, {NULL}, 0, 0, S_FORC5 , 0},
+	{"FORC5", 0, SPR_FORC, FF_TRANS50|4, 3, {NULL}, 0, 0, S_FORC6 , 0},
+	{"FORC6", 0, SPR_FORC, FF_TRANS50|5, 3, {NULL}, 0, 0, S_FORC7 , 0},
+	{"FORC7", 0, SPR_FORC, FF_TRANS50|6, 3, {NULL}, 0, 0, S_FORC8 , 0},
+	{"FORC8", 0, SPR_FORC, FF_TRANS50|7, 3, {NULL}, 0, 0, S_FORC9 , 0},
+	{"FORC9", 0, SPR_FORC, FF_TRANS50|8, 3, {NULL}, 0, 0, S_FORC10, 0},
+	{"FORC10", 0, SPR_FORC, FF_TRANS50|9, 3, {NULL}, 0, 0, S_FORC1 , 0},
+
+	{"FORC11", 0, SPR_FORC, FF_TRANS50|10, 3, {NULL}, 0, 0, S_FORC12, 0},
+	{"FORC12", 0, SPR_FORC, FF_TRANS50|11, 3, {NULL}, 0, 0, S_FORC13, 0},
+	{"FORC13", 0, SPR_FORC, FF_TRANS50|12, 3, {NULL}, 0, 0, S_FORC14, 0},
+	{"FORC14", 0, SPR_FORC, FF_TRANS50|13, 3, {NULL}, 0, 0, S_FORC15, 0},
+	{"FORC15", 0, SPR_FORC, FF_TRANS50|14, 3, {NULL}, 0, 0, S_FORC16, 0},
+	{"FORC16", 0, SPR_FORC, FF_TRANS50|15, 3, {NULL}, 0, 0, S_FORC17, 0},
+	{"FORC17", 0, SPR_FORC, FF_TRANS50|16, 3, {NULL}, 0, 0, S_FORC18, 0},
+	{"FORC18", 0, SPR_FORC, FF_TRANS50|17, 3, {NULL}, 0, 0, S_FORC19, 0},
+	{"FORC19", 0, SPR_FORC, FF_TRANS50|18, 3, {NULL}, 0, 0, S_FORC20, 0},
+	{"FORC20", 0, SPR_FORC, FF_TRANS50|19, 3, {NULL}, 0, 0, S_FORC11, 0},
+
+	{"FORC21", 0, SPR_FORC, FF_TRANS50|20, -1, {NULL}, 0, 0, S_NULL, 0},
+
+	{"ELEM1", 0, SPR_ELEM, FF_TRANS50   , 4, {NULL}, 0, 0, S_ELEM2 , 0},
+	{"ELEM2", 0, SPR_ELEM, FF_TRANS50| 1, 4, {NULL}, 0, 0, S_ELEM3 , 0},
+	{"ELEM3", 0, SPR_ELEM, FF_TRANS50| 2, 4, {NULL}, 0, 0, S_ELEM4 , 0},
+	{"ELEM4", 0, SPR_ELEM, FF_TRANS50| 3, 4, {NULL}, 0, 0, S_ELEM5 , 0},
+	{"ELEM5", 0, SPR_ELEM, FF_TRANS50| 4, 4, {NULL}, 0, 0, S_ELEM6 , 0},
+	{"ELEM6", 0, SPR_ELEM, FF_TRANS50| 5, 4, {NULL}, 0, 0, S_ELEM7 , 0},
+	{"ELEM7", 0, SPR_ELEM, FF_TRANS50| 6, 4, {NULL}, 0, 0, S_ELEM8 , 0},
+	{"ELEM8", 0, SPR_ELEM, FF_TRANS50| 7, 4, {NULL}, 0, 0, S_ELEM9 , 0},
+	{"ELEM9", 0, SPR_ELEM, FF_TRANS50| 8, 4, {NULL}, 0, 0, S_ELEM10, 0},
+	{"ELEM10", 0, SPR_ELEM, FF_TRANS50| 9, 4, {NULL}, 0, 0, S_ELEM11, 0},
+	{"ELEM11", 0, SPR_ELEM, FF_TRANS50|10, 4, {NULL}, 0, 0, S_ELEM12, 0},
+	{"ELEM12", 0, SPR_ELEM, FF_TRANS50|11, 4, {NULL}, 0, 0, S_ELEM1 , 0},
+
+	{"ELEM13", 0, SPR_NULL,             0, 1, {NULL}, 0, 0, S_ELEM14, 0},
+	{"ELEM14", 0, SPR_ELEM, FF_TRANS50|11, 1, {NULL}, 0, 0, S_ELEM1 , 0},
+
+	{"ELEMF1", 0, SPR_ELEM, FF_FULLBRIGHT|12, 3, {NULL}, 0, 0, S_ELEMF2 , 0},
+	{"ELEMF2", 0, SPR_ELEM, FF_FULLBRIGHT|13, 3, {NULL}, 0, 0, S_ELEMF3 , 0},
+	{"ELEMF3", 0, SPR_ELEM, FF_FULLBRIGHT|14, 3, {NULL}, 0, 0, S_ELEMF4 , 0},
+	{"ELEMF4", 0, SPR_ELEM, FF_FULLBRIGHT|15, 3, {NULL}, 0, 0, S_ELEMF5 , 0},
+	{"ELEMF5", 0, SPR_ELEM, FF_FULLBRIGHT|16, 3, {NULL}, 0, 0, S_ELEMF6 , 0},
+	{"ELEMF6", 0, SPR_ELEM, FF_FULLBRIGHT|17, 3, {NULL}, 0, 0, S_ELEMF7 , 0},
+	{"ELEMF7", 0, SPR_ELEM, FF_FULLBRIGHT|18, 3, {NULL}, 0, 0, S_ELEMF8 , 0},
+	{"ELEMF8", 0, SPR_ELEM, FF_FULLBRIGHT|19, 3, {NULL}, 0, 0, S_ELEMF1 , 0},
+
+	{"ELEMF9", 0, SPR_ELEM, FF_FULLBRIGHT|20, 1, {NULL}, 0, 0, S_ELEMF10, 0},
+	{"ELEMF10", 0, SPR_NULL, 0,                1, {NULL}, 0, 0, S_ELEMF1 , 0},
+
+	{"PITY1", 0, SPR_PITY, FF_TRANS30   , 2, {NULL}, 0, 0, S_PITY2, 0},
+	{"PITY2", 0, SPR_PITY, FF_TRANS30| 1, 2, {NULL}, 0, 0, S_PITY3, 0},
+	{"PITY3", 0, SPR_PITY, FF_TRANS30| 2, 2, {NULL}, 0, 0, S_PITY4, 0},
+	{"PITY4", 0, SPR_PITY, FF_TRANS30| 3, 2, {NULL}, 0, 0, S_PITY5, 0},
+	{"PITY5", 0, SPR_PITY, FF_TRANS30| 4, 2, {NULL}, 0, 0, S_PITY6, 0},
+	{"PITY6", 0, SPR_PITY, FF_TRANS30| 5, 2, {NULL}, 0, 0, S_PITY7, 0},
+	{"PITY7", 0, SPR_PITY, FF_TRANS30| 6, 2, {NULL}, 0, 0, S_PITY8, 0},
+	{"PITY8", 0, SPR_PITY, FF_TRANS30| 7, 2, {NULL}, 0, 0, S_PITY9, 0},
+	{"PITY9", 0, SPR_PITY, FF_TRANS30| 8, 2, {NULL}, 0, 0, S_PITY10, 0},
+	{"PITY10", 0, SPR_PITY, FF_TRANS30| 9, 2, {NULL}, 0, 0, S_PITY11, 0},
+	{"PITY11", 0, SPR_PITY, FF_TRANS30|10, 2, {NULL}, 0, 0, S_PITY12, 0},
+	{"PITY12", 0, SPR_PITY, FF_TRANS30|11, 2, {NULL}, 0, 0, S_PITY1, 0},
+
+	{"FIRS1", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40  , 2, {NULL}, 0, 0, S_FIRS2, 0},
+	{"FIRS2", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|1, 2, {NULL}, 0, 0, S_FIRS3, 0},
+	{"FIRS3", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|2, 2, {NULL}, 0, 0, S_FIRS4, 0},
+	{"FIRS4", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|3, 2, {NULL}, 0, 0, S_FIRS5, 0},
+	{"FIRS5", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|4, 2, {NULL}, 0, 0, S_FIRS6, 0},
+	{"FIRS6", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|5, 2, {NULL}, 0, 0, S_FIRS7, 0},
+	{"FIRS7", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|6, 2, {NULL}, 0, 0, S_FIRS8, 0},
+	{"FIRS8", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|7, 2, {NULL}, 0, 0, S_FIRS9, 0},
+	{"FIRS9", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|8, 2, {NULL}, 0, 0, S_FIRS1, 0},
+
+	{"FIRS10", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|18, 1, {NULL}, 0, 0, S_FIRS11, 0},
+	{"FIRS11", 0, SPR_NULL, 0,                           1, {NULL}, 0, 0, S_FIRS1 , 0},
+
+	{"FIRSB1", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40| 9, 2, {NULL}, 0, 0, S_FIRSB2, 0},
+	{"FIRSB2", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|10, 2, {NULL}, 0, 0, S_FIRSB3, 0},
+	{"FIRSB3", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|11, 2, {NULL}, 0, 0, S_FIRSB4, 0},
+	{"FIRSB4", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|12, 2, {NULL}, 0, 0, S_FIRSB5, 0},
+	{"FIRSB5", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|13, 2, {NULL}, 0, 0, S_FIRSB6, 0},
+	{"FIRSB6", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|14, 2, {NULL}, 0, 0, S_FIRSB7, 0},
+	{"FIRSB7", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|15, 2, {NULL}, 0, 0, S_FIRSB8, 0},
+	{"FIRSB8", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|16, 2, {NULL}, 0, 0, S_FIRSB9, 0},
+	{"FIRSB9", 0, SPR_FIRS, FF_FULLBRIGHT|FF_TRANS40|17, 2, {NULL}, 0, 0, S_FIRSB1, 0},
+
+	{"FIRSB10", 0, SPR_NULL, 0,                           2, {NULL}, 0, 0, S_FIRSB1 , 0},
+
+	{"BUBS1", 0, SPR_BUBS, FF_TRANS30  , 3, {NULL}, 0, 0, S_BUBS2, 0},
+	{"BUBS2", 0, SPR_BUBS, FF_TRANS30|1, 3, {NULL}, 0, 0, S_BUBS3, 0},
+	{"BUBS3", 0, SPR_BUBS, FF_TRANS30|2, 3, {NULL}, 0, 0, S_BUBS4, 0},
+	{"BUBS4", 0, SPR_BUBS, FF_TRANS30|3, 3, {NULL}, 0, 0, S_BUBS5, 0},
+	{"BUBS5", 0, SPR_BUBS, FF_TRANS30|4, 3, {NULL}, 0, 0, S_BUBS6, 0},
+	{"BUBS6", 0, SPR_BUBS, FF_TRANS30|5, 3, {NULL}, 0, 0, S_BUBS7, 0},
+	{"BUBS7", 0, SPR_BUBS, FF_TRANS30|6, 3, {NULL}, 0, 0, S_BUBS8, 0},
+	{"BUBS8", 0, SPR_BUBS, FF_TRANS30|7, 3, {NULL}, 0, 0, S_BUBS9, 0},
+	{"BUBS9", 0, SPR_BUBS, FF_TRANS30|8, 3, {NULL}, 0, 0, S_BUBS1, 0},
+
+	{"BUBS10", 0, SPR_NULL, 0,   3, {NULL}, 0, 0, S_BUBS1, 0},
+	{"BUBS11", 0, SPR_NULL, 0, 4*3, {NULL}, 0, 0, S_BUBS1, 0},
+
+	{"BUBSB1", 0, SPR_BUBS, FF_TRANS30| 9, 3, {NULL}, 0, 0, S_BUBSB2, 0},
+	{"BUBSB2", 0, SPR_BUBS, FF_TRANS30|10, 3, {NULL}, 0, 0, S_BUBSB3, 0},
+	{"BUBSB3", 0, SPR_BUBS, FF_TRANS30|11, 3, {NULL}, 0, 0, S_BUBSB4, 0},
+	{"BUBSB4", 0, SPR_BUBS, FF_TRANS30|10, 3, {NULL}, 0, 0, S_BUBSB1, 0},
+
+	{"BUBSB5", 0, SPR_BUBS, FF_TRANS30|12, 3, {NULL}, 0, 0, S_BUBSB3, 0},
+	{"BUBSB6", 0, SPR_BUBS, FF_TRANS30|13, 3, {NULL}, 0, 0, S_BUBSB5, 0},
+
+	{"ZAPS1", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20   ,   2, {NULL}, 0, 0, S_ZAPS2 , 0},
+	{"ZAPS2", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 1,   2, {NULL}, 0, 0, S_ZAPS3 , 0},
+	{"ZAPS3", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 2,   2, {NULL}, 0, 0, S_ZAPS4 , 0},
+	{"ZAPS4", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 3,   2, {NULL}, 0, 0, S_ZAPS5 , 0},
+	{"ZAPS5", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 4,   2, {NULL}, 0, 0, S_ZAPS6 , 0},
+	{"ZAPS6", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 5,   2, {NULL}, 0, 0, S_ZAPS7 , 0},
+	{"ZAPS7", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 6,   2, {NULL}, 0, 0, S_ZAPS8 , 0},
+	{"ZAPS8", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 7,   2, {NULL}, 0, 0, S_ZAPS9 , 0},
+	{"ZAPS9", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 8,   2, {NULL}, 0, 0, S_ZAPS10, 0},
+	{"ZAPS10", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 9,   2, {NULL}, 0, 0, S_ZAPS11, 0},
+	{"ZAPS11", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20|10,   2, {NULL}, 0, 0, S_ZAPS12, 0},
+	{"ZAPS12", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20|11,   2, {NULL}, 0, 0, S_ZAPS13, 0},
+	{"ZAPS13", 0, SPR_NULL,                           0, 9*2, {NULL}, 0, 0, S_ZAPS14, 0},
+	{"ZAPS14", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 9,   2, {NULL}, 0, 0, S_ZAPS15, 0},
+	{"ZAPS15", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20|10,   2, {NULL}, 0, 0, S_ZAPS16, 0},
+	{"ZAPS16", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20|11,   2, {NULL}, 0, 0, S_ZAPS1 , 0},
+
+	{"ZAPSB1", 0, SPR_NULL,                           0, 12*2, {NULL}, 0, 0, S_ZAPSB2 , 0},
+	{"ZAPSB2", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 8,    2, {NULL}, 0, 0, S_ZAPSB3 , 0},
+	{"ZAPSB3", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 7,    2, {NULL}, 0, 0, S_ZAPSB4 , 0},
+	{"ZAPSB4", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 6,    2, {NULL}, 0, 0, S_ZAPSB5 , 0},
+	{"ZAPSB5", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 5,    2, {NULL}, 0, 0, S_ZAPSB6 , 0},
+	{"ZAPSB6", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 4,    2, {NULL}, 0, 0, S_ZAPSB7 , 0},
+	{"ZAPSB7", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 3,    2, {NULL}, 0, 0, S_ZAPSB8 , 0},
+	{"ZAPSB8", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 2,    2, {NULL}, 0, 0, S_ZAPSB9 , 0},
+	{"ZAPSB9", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20| 1,    2, {NULL}, 0, 0, S_ZAPSB10, 0},
+	{"ZAPSB10", 0, SPR_ZAPS, FF_FULLBRIGHT|FF_TRANS20   ,    2, {NULL}, 0, 0, S_ZAPSB11, 0},
+	{"ZAPSB11", 0, SPR_NULL,                           0, 15*2, {NULL}, 0, 0, S_ZAPSB2 , 0},
 
 	// Thunder spark
-	{"S_THUNDERCOIN_SPARK", 0, SPR_SSPK, FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 1, 2, S_NULL, 0},
+	{"THUNDERCOIN_SPARK", 0, SPR_SSPK, FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 1, 2, S_NULL, 0},
 
 	// Invincibility Sparkles
-	{"S_IVSP", 0, SPR_IVSP, FF_ANIMATE|FF_FULLBRIGHT, 32, {NULL}, 31, 1, S_NULL, 0},
+	{"IVSP", 0, SPR_IVSP, FF_ANIMATE|FF_FULLBRIGHT, 32, {NULL}, 31, 1, S_NULL, 0},
 
 	// Super Sonic Spark
-	{"S_SSPK1", 0, SPR_SSPK,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK2, 0},
-	{"S_SSPK2", 0, SPR_SSPK, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK3, 0},
-	{"S_SSPK3", 0, SPR_SSPK, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK4, 0},
-	{"S_SSPK4", 0, SPR_SSPK, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK5, 0},
-	{"S_SSPK5", 0, SPR_SSPK,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
+	{"SSPK1", 0, SPR_SSPK,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK2, 0},
+	{"SSPK2", 0, SPR_SSPK, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK3, 0},
+	{"SSPK3", 0, SPR_SSPK, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK4, 0},
+	{"SSPK4", 0, SPR_SSPK, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK5, 0},
+	{"SSPK5", 0, SPR_SSPK,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
 
 	// Flicky-sized bubble
-	{"S_FLICKY_BUBBLE", 0, SPR_FBUB, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"FLICKY_BUBBLE", 0, SPR_FBUB, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Bluebird
-	{"S_FLICKY_01_OUT", 0, SPR_FL01, 0, 2, {A_FlickyCheck}, S_FLICKY_01_FLAP1, S_FLICKY_01_FLAP1, S_FLICKY_01_OUT, 0},
-	{"S_FLICKY_01_FLAP1", 0, SPR_FL01, 1, 3, {A_FlickyFly},          4*FRACUNIT,       16*FRACUNIT, S_FLICKY_01_FLAP2, 0},
-	{"S_FLICKY_01_FLAP2", 0, SPR_FL01, 2, 3, {A_FlickyFly},          4*FRACUNIT,       16*FRACUNIT, S_FLICKY_01_FLAP3, 0},
-	{"S_FLICKY_01_FLAP3", 0, SPR_FL01, 3, 3, {A_FlickyFly},          4*FRACUNIT,       16*FRACUNIT, S_FLICKY_01_FLAP1, 0},
-	{"S_FLICKY_01_STAND", 0, SPR_FL01, FF_ANIMATE|1, -1, {NULL}, 2, 3, S_NULL, 0},
-	{"S_FLICKY_01_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_01, 384*FRACUNIT, S_FLICKY_01_CENTER, 0},
+	{"FLICKY_01_OUT", 0, SPR_FL01, 0, 2, {A_FlickyCheck}, S_FLICKY_01_FLAP1, S_FLICKY_01_FLAP1, S_FLICKY_01_OUT, 0},
+	{"FLICKY_01_FLAP1", 0, SPR_FL01, 1, 3, {A_FlickyFly},          4*FRACUNIT,       16*FRACUNIT, S_FLICKY_01_FLAP2, 0},
+	{"FLICKY_01_FLAP2", 0, SPR_FL01, 2, 3, {A_FlickyFly},          4*FRACUNIT,       16*FRACUNIT, S_FLICKY_01_FLAP3, 0},
+	{"FLICKY_01_FLAP3", 0, SPR_FL01, 3, 3, {A_FlickyFly},          4*FRACUNIT,       16*FRACUNIT, S_FLICKY_01_FLAP1, 0},
+	{"FLICKY_01_STAND", 0, SPR_FL01, FF_ANIMATE|1, -1, {NULL}, 2, 3, S_NULL, 0},
+	{"FLICKY_01_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_01, 384*FRACUNIT, S_FLICKY_01_CENTER, 0},
 
 	// Rabbit
-	{"S_FLICKY_02_OUT", 0, SPR_FL02, 0, 2, {A_FlickyCheck}, S_FLICKY_02_AIM,                0, S_FLICKY_02_OUT, 0},
-	{"S_FLICKY_02_AIM", 0, SPR_FL02, 1, 1, {A_FlickyAim},             ANG30,      32*FRACUNIT, S_FLICKY_02_HOP, 0},
-	{"S_FLICKY_02_HOP", 0, SPR_FL02, 1, 1, {A_FlickyHop},        6*FRACUNIT,       4*FRACUNIT, S_FLICKY_02_UP, 0},
-	{"S_FLICKY_02_UP", 0, SPR_FL02, 2, 2, {A_FlickyCheck}, S_FLICKY_02_AIM, S_FLICKY_02_DOWN, S_FLICKY_02_UP, 0},
-	{"S_FLICKY_02_DOWN", 0, SPR_FL02, 3, 2, {A_FlickyCheck}, S_FLICKY_02_AIM,                0, S_FLICKY_02_DOWN, 0},
-	{"S_FLICKY_02_STAND", 0, SPR_FL02, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_FLICKY_02_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_02, 384*FRACUNIT, S_FLICKY_02_CENTER, 0},
+	{"FLICKY_02_OUT", 0, SPR_FL02, 0, 2, {A_FlickyCheck}, S_FLICKY_02_AIM,                0, S_FLICKY_02_OUT, 0},
+	{"FLICKY_02_AIM", 0, SPR_FL02, 1, 1, {A_FlickyAim},             ANG30,      32*FRACUNIT, S_FLICKY_02_HOP, 0},
+	{"FLICKY_02_HOP", 0, SPR_FL02, 1, 1, {A_FlickyHop},        6*FRACUNIT,       4*FRACUNIT, S_FLICKY_02_UP, 0},
+	{"FLICKY_02_UP", 0, SPR_FL02, 2, 2, {A_FlickyCheck}, S_FLICKY_02_AIM, S_FLICKY_02_DOWN, S_FLICKY_02_UP, 0},
+	{"FLICKY_02_DOWN", 0, SPR_FL02, 3, 2, {A_FlickyCheck}, S_FLICKY_02_AIM,                0, S_FLICKY_02_DOWN, 0},
+	{"FLICKY_02_STAND", 0, SPR_FL02, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"FLICKY_02_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_02, 384*FRACUNIT, S_FLICKY_02_CENTER, 0},
 
 	// Chicken
-	{"S_FLICKY_03_OUT", 0, SPR_FL03, 0, 2, {A_FlickyCheck},   S_FLICKY_03_AIM, S_FLICKY_03_FLAP1, S_FLICKY_03_OUT, 0},
-	{"S_FLICKY_03_AIM", 0, SPR_FL03, 1, 1, {A_FlickyAim},            ANGLE_45,       32*FRACUNIT, S_FLICKY_03_HOP, 0},
-	{"S_FLICKY_03_HOP", 0, SPR_FL03, 1, 1, {A_FlickyHop},          7*FRACUNIT,        2*FRACUNIT, S_FLICKY_03_UP, 0},
-	{"S_FLICKY_03_UP", 0, SPR_FL03, 2, 2, {A_FlickyFlutter}, S_FLICKY_03_HOP, S_FLICKY_03_FLAP1, S_FLICKY_03_UP, 0},
-	{"S_FLICKY_03_FLAP1", 0, SPR_FL03, 3, 2, {A_FlickyFlutter}, S_FLICKY_03_HOP,                 0, S_FLICKY_03_FLAP2, 0},
-	{"S_FLICKY_03_FLAP2", 0, SPR_FL03, 4, 2, {A_FlickyFlutter}, S_FLICKY_03_HOP,                 0, S_FLICKY_03_FLAP1, 0},
-	{"S_FLICKY_03_STAND", 0, SPR_FL03, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_FLICKY_03_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_03, 384*FRACUNIT, S_FLICKY_03_CENTER, 0},
+	{"FLICKY_03_OUT", 0, SPR_FL03, 0, 2, {A_FlickyCheck},   S_FLICKY_03_AIM, S_FLICKY_03_FLAP1, S_FLICKY_03_OUT, 0},
+	{"FLICKY_03_AIM", 0, SPR_FL03, 1, 1, {A_FlickyAim},            ANGLE_45,       32*FRACUNIT, S_FLICKY_03_HOP, 0},
+	{"FLICKY_03_HOP", 0, SPR_FL03, 1, 1, {A_FlickyHop},          7*FRACUNIT,        2*FRACUNIT, S_FLICKY_03_UP, 0},
+	{"FLICKY_03_UP", 0, SPR_FL03, 2, 2, {A_FlickyFlutter}, S_FLICKY_03_HOP, S_FLICKY_03_FLAP1, S_FLICKY_03_UP, 0},
+	{"FLICKY_03_FLAP1", 0, SPR_FL03, 3, 2, {A_FlickyFlutter}, S_FLICKY_03_HOP,                 0, S_FLICKY_03_FLAP2, 0},
+	{"FLICKY_03_FLAP2", 0, SPR_FL03, 4, 2, {A_FlickyFlutter}, S_FLICKY_03_HOP,                 0, S_FLICKY_03_FLAP1, 0},
+	{"FLICKY_03_STAND", 0, SPR_FL03, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"FLICKY_03_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_03, 384*FRACUNIT, S_FLICKY_03_CENTER, 0},
 
 	// Seal
-	{"S_FLICKY_04_OUT", 0, SPR_FL04, 0, 2, {A_FlickyCheck}, S_FLICKY_04_AIM,                 0, S_FLICKY_04_OUT, 0},
-	{"S_FLICKY_04_AIM", 0, SPR_FL04, 1, 1, {A_FlickyAim},             ANG30,       32*FRACUNIT, S_FLICKY_04_HOP, 0},
-	{"S_FLICKY_04_HOP", 0, SPR_FL04, 1, 1, {A_FlickyHop},        3*FRACUNIT,        2*FRACUNIT, S_FLICKY_04_UP, 0},
-	{"S_FLICKY_04_UP", 0, SPR_FL04, 2, 4, {A_FlickyCheck}, S_FLICKY_04_AIM,  S_FLICKY_04_DOWN, S_FLICKY_04_UP, 0},
-	{"S_FLICKY_04_DOWN", 0, SPR_FL04, 3, 4, {A_FlickyCheck}, S_FLICKY_04_AIM,                 0, S_FLICKY_04_DOWN, 0},
-	{"S_FLICKY_04_SWIM1", 0, SPR_FL04, 3, 4, {A_FlickyFly},        2*FRACUNIT,       48*FRACUNIT, S_FLICKY_04_SWIM2, 0},
-	{"S_FLICKY_04_SWIM2", 0, SPR_FL04, 4, 4, {A_FlickyCoast},        FRACUNIT, S_FLICKY_04_SWIM1, S_FLICKY_04_SWIM3, 0},
-	{"S_FLICKY_04_SWIM3", 0, SPR_FL04, 3, 4, {A_FlickyCoast},        FRACUNIT, S_FLICKY_04_SWIM1, S_FLICKY_04_SWIM4, 0},
-	{"S_FLICKY_04_SWIM4", 0, SPR_FL04, 5, 4, {A_FlickyCoast},        FRACUNIT, S_FLICKY_04_SWIM1, S_FLICKY_04_SWIM1, 0},
-	{"S_FLICKY_04_STAND", 0, SPR_FL04, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_FLICKY_04_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_04, 384*FRACUNIT, S_FLICKY_04_CENTER, 0},
+	{"FLICKY_04_OUT", 0, SPR_FL04, 0, 2, {A_FlickyCheck}, S_FLICKY_04_AIM,                 0, S_FLICKY_04_OUT, 0},
+	{"FLICKY_04_AIM", 0, SPR_FL04, 1, 1, {A_FlickyAim},             ANG30,       32*FRACUNIT, S_FLICKY_04_HOP, 0},
+	{"FLICKY_04_HOP", 0, SPR_FL04, 1, 1, {A_FlickyHop},        3*FRACUNIT,        2*FRACUNIT, S_FLICKY_04_UP, 0},
+	{"FLICKY_04_UP", 0, SPR_FL04, 2, 4, {A_FlickyCheck}, S_FLICKY_04_AIM,  S_FLICKY_04_DOWN, S_FLICKY_04_UP, 0},
+	{"FLICKY_04_DOWN", 0, SPR_FL04, 3, 4, {A_FlickyCheck}, S_FLICKY_04_AIM,                 0, S_FLICKY_04_DOWN, 0},
+	{"FLICKY_04_SWIM1", 0, SPR_FL04, 3, 4, {A_FlickyFly},        2*FRACUNIT,       48*FRACUNIT, S_FLICKY_04_SWIM2, 0},
+	{"FLICKY_04_SWIM2", 0, SPR_FL04, 4, 4, {A_FlickyCoast},        FRACUNIT, S_FLICKY_04_SWIM1, S_FLICKY_04_SWIM3, 0},
+	{"FLICKY_04_SWIM3", 0, SPR_FL04, 3, 4, {A_FlickyCoast},        FRACUNIT, S_FLICKY_04_SWIM1, S_FLICKY_04_SWIM4, 0},
+	{"FLICKY_04_SWIM4", 0, SPR_FL04, 5, 4, {A_FlickyCoast},        FRACUNIT, S_FLICKY_04_SWIM1, S_FLICKY_04_SWIM1, 0},
+	{"FLICKY_04_STAND", 0, SPR_FL04, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"FLICKY_04_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_04, 384*FRACUNIT, S_FLICKY_04_CENTER, 0},
 
 	// Pig
-	{"S_FLICKY_05_OUT", 0, SPR_FL05, 0, 2, {A_FlickyCheck}, S_FLICKY_05_AIM,                0, S_FLICKY_05_OUT, 0},
-	{"S_FLICKY_05_AIM", 0, SPR_FL05, 1, 1, {A_FlickyAim},             ANG20,      32*FRACUNIT, S_FLICKY_05_HOP, 0},
-	{"S_FLICKY_05_HOP", 0, SPR_FL05, 1, 1, {A_FlickyHop},        4*FRACUNIT,       3*FRACUNIT, S_FLICKY_05_UP, 0},
-	{"S_FLICKY_05_UP", 0, SPR_FL05, 2, 2, {A_FlickyCheck}, S_FLICKY_05_AIM, S_FLICKY_05_DOWN, S_FLICKY_05_UP, 0},
-	{"S_FLICKY_05_DOWN", 0, SPR_FL05, 3, 2, {A_FlickyCheck}, S_FLICKY_05_AIM,                0, S_FLICKY_05_DOWN, 0},
-	{"S_FLICKY_05_STAND", 0, SPR_FL05, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_FLICKY_05_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_05, 384*FRACUNIT, S_FLICKY_05_CENTER, 0},
+	{"FLICKY_05_OUT", 0, SPR_FL05, 0, 2, {A_FlickyCheck}, S_FLICKY_05_AIM,                0, S_FLICKY_05_OUT, 0},
+	{"FLICKY_05_AIM", 0, SPR_FL05, 1, 1, {A_FlickyAim},             ANG20,      32*FRACUNIT, S_FLICKY_05_HOP, 0},
+	{"FLICKY_05_HOP", 0, SPR_FL05, 1, 1, {A_FlickyHop},        4*FRACUNIT,       3*FRACUNIT, S_FLICKY_05_UP, 0},
+	{"FLICKY_05_UP", 0, SPR_FL05, 2, 2, {A_FlickyCheck}, S_FLICKY_05_AIM, S_FLICKY_05_DOWN, S_FLICKY_05_UP, 0},
+	{"FLICKY_05_DOWN", 0, SPR_FL05, 3, 2, {A_FlickyCheck}, S_FLICKY_05_AIM,                0, S_FLICKY_05_DOWN, 0},
+	{"FLICKY_05_STAND", 0, SPR_FL05, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"FLICKY_05_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_05, 384*FRACUNIT, S_FLICKY_05_CENTER, 0},
 
 	// Chipmunk
-	{"S_FLICKY_06_OUT", 0, SPR_FL06, 0, 2, {A_FlickyCheck}, S_FLICKY_06_AIM,                0, S_FLICKY_06_OUT, 0},
-	{"S_FLICKY_06_AIM", 0, SPR_FL06, 1, 1, {A_FlickyAim},          ANGLE_90,      32*FRACUNIT, S_FLICKY_06_HOP, 0},
-	{"S_FLICKY_06_HOP", 0, SPR_FL06, 1, 1, {A_FlickyHop},        5*FRACUNIT,       6*FRACUNIT, S_FLICKY_06_UP, 0},
-	{"S_FLICKY_06_UP", 0, SPR_FL06, 2, 2, {A_FlickyCheck}, S_FLICKY_06_AIM, S_FLICKY_06_DOWN, S_FLICKY_06_UP, 0},
-	{"S_FLICKY_06_DOWN", 0, SPR_FL06, 3, 2, {A_FlickyCheck}, S_FLICKY_06_AIM,                0, S_FLICKY_06_DOWN, 0},
-	{"S_FLICKY_06_STAND", 0, SPR_FL06, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_FLICKY_06_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_06, 384*FRACUNIT, S_FLICKY_06_CENTER, 0},
+	{"FLICKY_06_OUT", 0, SPR_FL06, 0, 2, {A_FlickyCheck}, S_FLICKY_06_AIM,                0, S_FLICKY_06_OUT, 0},
+	{"FLICKY_06_AIM", 0, SPR_FL06, 1, 1, {A_FlickyAim},          ANGLE_90,      32*FRACUNIT, S_FLICKY_06_HOP, 0},
+	{"FLICKY_06_HOP", 0, SPR_FL06, 1, 1, {A_FlickyHop},        5*FRACUNIT,       6*FRACUNIT, S_FLICKY_06_UP, 0},
+	{"FLICKY_06_UP", 0, SPR_FL06, 2, 2, {A_FlickyCheck}, S_FLICKY_06_AIM, S_FLICKY_06_DOWN, S_FLICKY_06_UP, 0},
+	{"FLICKY_06_DOWN", 0, SPR_FL06, 3, 2, {A_FlickyCheck}, S_FLICKY_06_AIM,                0, S_FLICKY_06_DOWN, 0},
+	{"FLICKY_06_STAND", 0, SPR_FL06, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"FLICKY_06_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_06, 384*FRACUNIT, S_FLICKY_06_CENTER, 0},
 
 	// Penguin
-	{"S_FLICKY_07_OUT", 0, SPR_FL07, 0, 2, {A_FlickyCheck}, S_FLICKY_07_AIML,                 0, S_FLICKY_07_OUT, 0},
-	{"S_FLICKY_07_AIML", 0, SPR_FL07, 1, 1, {A_FlickyAim},              ANG30,       32*FRACUNIT, S_FLICKY_07_HOPL, 0},
-	{"S_FLICKY_07_HOPL", 0, SPR_FL07, 1, 1, {A_FlickyHop},         4*FRACUNIT,        2*FRACUNIT, S_FLICKY_07_UPL, 0},
-	{"S_FLICKY_07_UPL", 0, SPR_FL07, 2, 4, {A_FlickyCheck}, S_FLICKY_07_AIMR, S_FLICKY_07_DOWNL, S_FLICKY_07_UPL, 0},
-	{"S_FLICKY_07_DOWNL", 0, SPR_FL07, 1, 4, {A_FlickyCheck}, S_FLICKY_07_AIMR,                 0, S_FLICKY_07_DOWNL, 0},
-	{"S_FLICKY_07_AIMR", 0, SPR_FL07, 1, 1, {A_FlickyAim},              ANG30,       32*FRACUNIT, S_FLICKY_07_HOPR, 0},
-	{"S_FLICKY_07_HOPR", 0, SPR_FL07, 1, 1, {A_FlickyHop},         4*FRACUNIT,        2*FRACUNIT, S_FLICKY_07_UPR, 0},
-	{"S_FLICKY_07_UPR", 0, SPR_FL07, 3, 4, {A_FlickyCheck}, S_FLICKY_07_AIML, S_FLICKY_07_DOWNR, S_FLICKY_07_UPR, 0},
-	{"S_FLICKY_07_DOWNR", 0, SPR_FL07, 1, 4, {A_FlickyCheck}, S_FLICKY_07_AIML,                 0, S_FLICKY_07_DOWNR, 0},
-	{"S_FLICKY_07_SWIM1", 0, SPR_FL07, 4, 4, {A_FlickyFly},         3*FRACUNIT,       72*FRACUNIT, S_FLICKY_07_SWIM2, 0},
-	{"S_FLICKY_07_SWIM2", 0, SPR_FL07, 5, 4, {A_FlickyCoast},         FRACUNIT, S_FLICKY_07_SWIM1, S_FLICKY_07_SWIM3, 0},
-	{"S_FLICKY_07_SWIM3", 0, SPR_FL07, 6, 4, {A_FlickyCoast},       2*FRACUNIT, S_FLICKY_07_SWIM1, S_FLICKY_07_SWIM3, 0},
-	{"S_FLICKY_07_STAND", 0, SPR_FL07, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_FLICKY_07_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_07, 384*FRACUNIT, S_FLICKY_07_CENTER, 0},
+	{"FLICKY_07_OUT", 0, SPR_FL07, 0, 2, {A_FlickyCheck}, S_FLICKY_07_AIML,                 0, S_FLICKY_07_OUT, 0},
+	{"FLICKY_07_AIML", 0, SPR_FL07, 1, 1, {A_FlickyAim},              ANG30,       32*FRACUNIT, S_FLICKY_07_HOPL, 0},
+	{"FLICKY_07_HOPL", 0, SPR_FL07, 1, 1, {A_FlickyHop},         4*FRACUNIT,        2*FRACUNIT, S_FLICKY_07_UPL, 0},
+	{"FLICKY_07_UPL", 0, SPR_FL07, 2, 4, {A_FlickyCheck}, S_FLICKY_07_AIMR, S_FLICKY_07_DOWNL, S_FLICKY_07_UPL, 0},
+	{"FLICKY_07_DOWNL", 0, SPR_FL07, 1, 4, {A_FlickyCheck}, S_FLICKY_07_AIMR,                 0, S_FLICKY_07_DOWNL, 0},
+	{"FLICKY_07_AIMR", 0, SPR_FL07, 1, 1, {A_FlickyAim},              ANG30,       32*FRACUNIT, S_FLICKY_07_HOPR, 0},
+	{"FLICKY_07_HOPR", 0, SPR_FL07, 1, 1, {A_FlickyHop},         4*FRACUNIT,        2*FRACUNIT, S_FLICKY_07_UPR, 0},
+	{"FLICKY_07_UPR", 0, SPR_FL07, 3, 4, {A_FlickyCheck}, S_FLICKY_07_AIML, S_FLICKY_07_DOWNR, S_FLICKY_07_UPR, 0},
+	{"FLICKY_07_DOWNR", 0, SPR_FL07, 1, 4, {A_FlickyCheck}, S_FLICKY_07_AIML,                 0, S_FLICKY_07_DOWNR, 0},
+	{"FLICKY_07_SWIM1", 0, SPR_FL07, 4, 4, {A_FlickyFly},         3*FRACUNIT,       72*FRACUNIT, S_FLICKY_07_SWIM2, 0},
+	{"FLICKY_07_SWIM2", 0, SPR_FL07, 5, 4, {A_FlickyCoast},         FRACUNIT, S_FLICKY_07_SWIM1, S_FLICKY_07_SWIM3, 0},
+	{"FLICKY_07_SWIM3", 0, SPR_FL07, 6, 4, {A_FlickyCoast},       2*FRACUNIT, S_FLICKY_07_SWIM1, S_FLICKY_07_SWIM3, 0},
+	{"FLICKY_07_STAND", 0, SPR_FL07, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"FLICKY_07_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_07, 384*FRACUNIT, S_FLICKY_07_CENTER, 0},
 
 	// Fish
-	{"S_FLICKY_08_OUT", 0, SPR_FL08, 0, 2, {A_FlickyCheck}, S_FLICKY_08_AIM,                 0, S_FLICKY_08_OUT, 0},
-	{"S_FLICKY_08_AIM", 0, SPR_FL08, 2, 1, {A_FlickyAim},             ANG30,       32*FRACUNIT, S_FLICKY_08_HOP, 0},
-	{"S_FLICKY_08_HOP", 0, SPR_FL08, 2, 1, {A_FlickyFlounder},   2*FRACUNIT,        1*FRACUNIT, S_FLICKY_08_FLAP1, 0},
-	{"S_FLICKY_08_FLAP1", 0, SPR_FL08, 0, 4, {A_FlickyCheck}, S_FLICKY_08_AIM,                 0, S_FLICKY_08_FLAP2, 0},
-	{"S_FLICKY_08_FLAP2", 0, SPR_FL08, 1, 4, {A_FlickyCheck}, S_FLICKY_08_AIM,                 0, S_FLICKY_08_FLAP3, 0},
-	{"S_FLICKY_08_FLAP3", 0, SPR_FL08, 0, 4, {A_FlickyCheck}, S_FLICKY_08_AIM,                 0, S_FLICKY_08_FLAP4, 0},
-	{"S_FLICKY_08_FLAP4", 0, SPR_FL08, 2, 4, {A_FlickyCheck}, S_FLICKY_08_AIM,                 0, S_FLICKY_08_FLAP1, 0},
-	{"S_FLICKY_08_SWIM1", 0, SPR_FL08, 0, 4, {A_FlickyFly},        3*FRACUNIT,       64*FRACUNIT, S_FLICKY_08_SWIM2, 0},
-	{"S_FLICKY_08_SWIM2", 0, SPR_FL08, 1, 4, {A_FlickyCoast},        FRACUNIT, S_FLICKY_08_SWIM1, S_FLICKY_08_SWIM3, 0},
-	{"S_FLICKY_08_SWIM3", 0, SPR_FL08, 0, 4, {A_FlickyCoast},        FRACUNIT, S_FLICKY_08_SWIM1, S_FLICKY_08_SWIM4, 0},
-	{"S_FLICKY_08_SWIM4", 0, SPR_FL08, 2, 4, {A_FlickyCoast},        FRACUNIT, S_FLICKY_08_SWIM1, S_FLICKY_08_SWIM4, 0},
-	{"S_FLICKY_08_STAND", 0, SPR_FL08, FF_ANIMATE, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_FLICKY_08_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_08, 384*FRACUNIT, S_FLICKY_08_CENTER, 0},
+	{"FLICKY_08_OUT", 0, SPR_FL08, 0, 2, {A_FlickyCheck}, S_FLICKY_08_AIM,                 0, S_FLICKY_08_OUT, 0},
+	{"FLICKY_08_AIM", 0, SPR_FL08, 2, 1, {A_FlickyAim},             ANG30,       32*FRACUNIT, S_FLICKY_08_HOP, 0},
+	{"FLICKY_08_HOP", 0, SPR_FL08, 2, 1, {A_FlickyFlounder},   2*FRACUNIT,        1*FRACUNIT, S_FLICKY_08_FLAP1, 0},
+	{"FLICKY_08_FLAP1", 0, SPR_FL08, 0, 4, {A_FlickyCheck}, S_FLICKY_08_AIM,                 0, S_FLICKY_08_FLAP2, 0},
+	{"FLICKY_08_FLAP2", 0, SPR_FL08, 1, 4, {A_FlickyCheck}, S_FLICKY_08_AIM,                 0, S_FLICKY_08_FLAP3, 0},
+	{"FLICKY_08_FLAP3", 0, SPR_FL08, 0, 4, {A_FlickyCheck}, S_FLICKY_08_AIM,                 0, S_FLICKY_08_FLAP4, 0},
+	{"FLICKY_08_FLAP4", 0, SPR_FL08, 2, 4, {A_FlickyCheck}, S_FLICKY_08_AIM,                 0, S_FLICKY_08_FLAP1, 0},
+	{"FLICKY_08_SWIM1", 0, SPR_FL08, 0, 4, {A_FlickyFly},        3*FRACUNIT,       64*FRACUNIT, S_FLICKY_08_SWIM2, 0},
+	{"FLICKY_08_SWIM2", 0, SPR_FL08, 1, 4, {A_FlickyCoast},        FRACUNIT, S_FLICKY_08_SWIM1, S_FLICKY_08_SWIM3, 0},
+	{"FLICKY_08_SWIM3", 0, SPR_FL08, 0, 4, {A_FlickyCoast},        FRACUNIT, S_FLICKY_08_SWIM1, S_FLICKY_08_SWIM4, 0},
+	{"FLICKY_08_SWIM4", 0, SPR_FL08, 2, 4, {A_FlickyCoast},        FRACUNIT, S_FLICKY_08_SWIM1, S_FLICKY_08_SWIM4, 0},
+	{"FLICKY_08_STAND", 0, SPR_FL08, FF_ANIMATE, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"FLICKY_08_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_08, 384*FRACUNIT, S_FLICKY_08_CENTER, 0},
 
 	// Ram
-	{"S_FLICKY_09_OUT", 0, SPR_FL09, 0, 2, {A_FlickyCheck}, S_FLICKY_09_AIM,                0, S_FLICKY_09_OUT, 0},
-	{"S_FLICKY_09_AIM", 0, SPR_FL09, 1, 1, {A_FlickyAim},             ANG30,      32*FRACUNIT, S_FLICKY_09_HOP, 0},
-	{"S_FLICKY_09_HOP", 0, SPR_FL09, 1, 1, {A_FlickyHop},        7*FRACUNIT,       2*FRACUNIT, S_FLICKY_09_UP, 0},
-	{"S_FLICKY_09_UP", 0, SPR_FL09, 2, 2, {A_FlickyCheck}, S_FLICKY_09_AIM, S_FLICKY_09_DOWN, S_FLICKY_09_UP, 0},
-	{"S_FLICKY_09_DOWN", 0, SPR_FL09, 3, 2, {A_FlickyCheck}, S_FLICKY_09_AIM,                0, S_FLICKY_09_DOWN, 0},
-	{"S_FLICKY_09_STAND", 0, SPR_FL09, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_FLICKY_09_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_09, 384*FRACUNIT, S_FLICKY_09_CENTER, 0},
+	{"FLICKY_09_OUT", 0, SPR_FL09, 0, 2, {A_FlickyCheck}, S_FLICKY_09_AIM,                0, S_FLICKY_09_OUT, 0},
+	{"FLICKY_09_AIM", 0, SPR_FL09, 1, 1, {A_FlickyAim},             ANG30,      32*FRACUNIT, S_FLICKY_09_HOP, 0},
+	{"FLICKY_09_HOP", 0, SPR_FL09, 1, 1, {A_FlickyHop},        7*FRACUNIT,       2*FRACUNIT, S_FLICKY_09_UP, 0},
+	{"FLICKY_09_UP", 0, SPR_FL09, 2, 2, {A_FlickyCheck}, S_FLICKY_09_AIM, S_FLICKY_09_DOWN, S_FLICKY_09_UP, 0},
+	{"FLICKY_09_DOWN", 0, SPR_FL09, 3, 2, {A_FlickyCheck}, S_FLICKY_09_AIM,                0, S_FLICKY_09_DOWN, 0},
+	{"FLICKY_09_STAND", 0, SPR_FL09, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"FLICKY_09_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_09, 384*FRACUNIT, S_FLICKY_09_CENTER, 0},
 
 	// Puffin
-	{"S_FLICKY_10_OUT", 0, SPR_FL10, 0, 2, {A_FlickyCheck}, S_FLICKY_10_FLAP1, S_FLICKY_10_FLAP1, S_FLICKY_10_OUT, 0},
-	{"S_FLICKY_10_FLAP1", 0, SPR_FL10, 1, 3, {A_FlickySoar},         4*FRACUNIT,       16*FRACUNIT, S_FLICKY_10_FLAP2, 0},
-	{"S_FLICKY_10_FLAP2", 0, SPR_FL10, 2, 3, {A_FlickySoar},         4*FRACUNIT,       16*FRACUNIT, S_FLICKY_10_FLAP1, 0},
-	{"S_FLICKY_10_STAND", 0, SPR_FL10, FF_ANIMATE|1, -1, {NULL}, 1, 3, S_NULL, 0},
-	{"S_FLICKY_10_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_10, 384*FRACUNIT, S_FLICKY_10_CENTER, 0},
+	{"FLICKY_10_OUT", 0, SPR_FL10, 0, 2, {A_FlickyCheck}, S_FLICKY_10_FLAP1, S_FLICKY_10_FLAP1, S_FLICKY_10_OUT, 0},
+	{"FLICKY_10_FLAP1", 0, SPR_FL10, 1, 3, {A_FlickySoar},         4*FRACUNIT,       16*FRACUNIT, S_FLICKY_10_FLAP2, 0},
+	{"FLICKY_10_FLAP2", 0, SPR_FL10, 2, 3, {A_FlickySoar},         4*FRACUNIT,       16*FRACUNIT, S_FLICKY_10_FLAP1, 0},
+	{"FLICKY_10_STAND", 0, SPR_FL10, FF_ANIMATE|1, -1, {NULL}, 1, 3, S_NULL, 0},
+	{"FLICKY_10_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_10, 384*FRACUNIT, S_FLICKY_10_CENTER, 0},
 
 	// Cow
-	{"S_FLICKY_11_OUT", 0, SPR_FL11, 0, 2, {A_FlickyCheck}, S_FLICKY_11_AIM,           0, S_FLICKY_11_OUT, 0},
-	{"S_FLICKY_11_AIM", 0, SPR_FL11, 1, 1, {A_FlickyAim},          ANGLE_90, 64*FRACUNIT, S_FLICKY_11_RUN1, 0},
-	{"S_FLICKY_11_RUN1", 0, SPR_FL11, 1, 3, {A_FlickyHop},        FRACUNIT/2,  2*FRACUNIT, S_FLICKY_11_RUN2, 0},
-	{"S_FLICKY_11_RUN2", 0, SPR_FL11, 2, 4, {A_FlickyHop},        FRACUNIT/2,  2*FRACUNIT, S_FLICKY_11_RUN3, 0},
-	{"S_FLICKY_11_RUN3", 0, SPR_FL11, 3, 4, {A_FlickyHop},        FRACUNIT/2,  2*FRACUNIT, S_FLICKY_11_AIM, 0},
-	{"S_FLICKY_11_STAND", 0, SPR_FL11, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_FLICKY_11_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_11, 384*FRACUNIT, S_FLICKY_11_CENTER, 0},
+	{"FLICKY_11_OUT", 0, SPR_FL11, 0, 2, {A_FlickyCheck}, S_FLICKY_11_AIM,           0, S_FLICKY_11_OUT, 0},
+	{"FLICKY_11_AIM", 0, SPR_FL11, 1, 1, {A_FlickyAim},          ANGLE_90, 64*FRACUNIT, S_FLICKY_11_RUN1, 0},
+	{"FLICKY_11_RUN1", 0, SPR_FL11, 1, 3, {A_FlickyHop},        FRACUNIT/2,  2*FRACUNIT, S_FLICKY_11_RUN2, 0},
+	{"FLICKY_11_RUN2", 0, SPR_FL11, 2, 4, {A_FlickyHop},        FRACUNIT/2,  2*FRACUNIT, S_FLICKY_11_RUN3, 0},
+	{"FLICKY_11_RUN3", 0, SPR_FL11, 3, 4, {A_FlickyHop},        FRACUNIT/2,  2*FRACUNIT, S_FLICKY_11_AIM, 0},
+	{"FLICKY_11_STAND", 0, SPR_FL11, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"FLICKY_11_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_11, 384*FRACUNIT, S_FLICKY_11_CENTER, 0},
 
 	// Rat
-	{"S_FLICKY_12_OUT", 0, SPR_FL12, 0, 2, {A_FlickyCheck}, S_FLICKY_12_AIM,           0, S_FLICKY_12_OUT, 0},
-	{"S_FLICKY_12_AIM", 0, SPR_FL12, 1, 1, {A_FlickyAim},          ANGLE_90, 32*FRACUNIT, S_FLICKY_12_RUN1, 0},
-	{"S_FLICKY_12_RUN1", 0, SPR_FL12, 1, 2, {A_FlickyHop},                 1, 12*FRACUNIT, S_FLICKY_12_RUN2, 0},
-	{"S_FLICKY_12_RUN2", 0, SPR_FL12, 2, 3, {A_FlickyHop},                 1, 12*FRACUNIT, S_FLICKY_12_RUN3, 0},
-	{"S_FLICKY_12_RUN3", 0, SPR_FL12, 3, 3, {A_FlickyHop},                 1, 12*FRACUNIT, S_FLICKY_12_AIM, 0},
-	{"S_FLICKY_12_STAND", 0, SPR_FL12, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_FLICKY_12_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_12, 384*FRACUNIT, S_FLICKY_12_CENTER, 0},
+	{"FLICKY_12_OUT", 0, SPR_FL12, 0, 2, {A_FlickyCheck}, S_FLICKY_12_AIM,           0, S_FLICKY_12_OUT, 0},
+	{"FLICKY_12_AIM", 0, SPR_FL12, 1, 1, {A_FlickyAim},          ANGLE_90, 32*FRACUNIT, S_FLICKY_12_RUN1, 0},
+	{"FLICKY_12_RUN1", 0, SPR_FL12, 1, 2, {A_FlickyHop},                 1, 12*FRACUNIT, S_FLICKY_12_RUN2, 0},
+	{"FLICKY_12_RUN2", 0, SPR_FL12, 2, 3, {A_FlickyHop},                 1, 12*FRACUNIT, S_FLICKY_12_RUN3, 0},
+	{"FLICKY_12_RUN3", 0, SPR_FL12, 3, 3, {A_FlickyHop},                 1, 12*FRACUNIT, S_FLICKY_12_AIM, 0},
+	{"FLICKY_12_STAND", 0, SPR_FL12, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"FLICKY_12_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_12, 384*FRACUNIT, S_FLICKY_12_CENTER, 0},
 
 	// Bear
-	{"S_FLICKY_13_OUT", 0, SPR_FL13, 0, 2, {A_FlickyCheck}, S_FLICKY_13_AIM,                0, S_FLICKY_13_OUT, 0},
-	{"S_FLICKY_13_AIM", 0, SPR_FL13, 1, 1, {A_FlickyAim},             ANG30,      32*FRACUNIT, S_FLICKY_13_HOP, 0},
-	{"S_FLICKY_13_HOP", 0, SPR_FL13, 1, 1, {A_FlickyHop},        5*FRACUNIT,       3*FRACUNIT, S_FLICKY_13_UP, 0},
-	{"S_FLICKY_13_UP", 0, SPR_FL13, 2, 2, {A_FlickyCheck}, S_FLICKY_13_AIM, S_FLICKY_13_DOWN, S_FLICKY_13_UP, 0},
-	{"S_FLICKY_13_DOWN", 0, SPR_FL13, 3, 2, {A_FlickyCheck}, S_FLICKY_13_AIM,                0, S_FLICKY_13_DOWN, 0},
-	{"S_FLICKY_13_STAND", 0, SPR_FL13, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_FLICKY_13_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_13, 384*FRACUNIT, S_FLICKY_13_CENTER, 0},
+	{"FLICKY_13_OUT", 0, SPR_FL13, 0, 2, {A_FlickyCheck}, S_FLICKY_13_AIM,                0, S_FLICKY_13_OUT, 0},
+	{"FLICKY_13_AIM", 0, SPR_FL13, 1, 1, {A_FlickyAim},             ANG30,      32*FRACUNIT, S_FLICKY_13_HOP, 0},
+	{"FLICKY_13_HOP", 0, SPR_FL13, 1, 1, {A_FlickyHop},        5*FRACUNIT,       3*FRACUNIT, S_FLICKY_13_UP, 0},
+	{"FLICKY_13_UP", 0, SPR_FL13, 2, 2, {A_FlickyCheck}, S_FLICKY_13_AIM, S_FLICKY_13_DOWN, S_FLICKY_13_UP, 0},
+	{"FLICKY_13_DOWN", 0, SPR_FL13, 3, 2, {A_FlickyCheck}, S_FLICKY_13_AIM,                0, S_FLICKY_13_DOWN, 0},
+	{"FLICKY_13_STAND", 0, SPR_FL13, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"FLICKY_13_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_13, 384*FRACUNIT, S_FLICKY_13_CENTER, 0},
 
 	// Dove
-	{"S_FLICKY_14_OUT", 0, SPR_FL14, 0, 2, {A_FlickyCheck}, S_FLICKY_14_FLAP1, S_FLICKY_14_FLAP1, S_FLICKY_14_OUT, 0},
-	{"S_FLICKY_14_FLAP1", 0, SPR_FL14, 1, 3, {A_FlickySoar},         4*FRACUNIT,       32*FRACUNIT, S_FLICKY_14_FLAP2, 0},
-	{"S_FLICKY_14_FLAP2", 0, SPR_FL14, 2, 3, {A_FlickySoar},         4*FRACUNIT,       32*FRACUNIT, S_FLICKY_14_FLAP3, 0},
-	{"S_FLICKY_14_FLAP3", 0, SPR_FL14, 3, 3, {A_FlickySoar},         4*FRACUNIT,       32*FRACUNIT, S_FLICKY_14_FLAP1, 0},
-	{"S_FLICKY_14_STAND", 0, SPR_FL14, FF_ANIMATE|1, -1, {NULL}, 2, 3, S_NULL, 0},
-	{"S_FLICKY_14_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_14, 384*FRACUNIT, S_FLICKY_14_CENTER, 0},
+	{"FLICKY_14_OUT", 0, SPR_FL14, 0, 2, {A_FlickyCheck}, S_FLICKY_14_FLAP1, S_FLICKY_14_FLAP1, S_FLICKY_14_OUT, 0},
+	{"FLICKY_14_FLAP1", 0, SPR_FL14, 1, 3, {A_FlickySoar},         4*FRACUNIT,       32*FRACUNIT, S_FLICKY_14_FLAP2, 0},
+	{"FLICKY_14_FLAP2", 0, SPR_FL14, 2, 3, {A_FlickySoar},         4*FRACUNIT,       32*FRACUNIT, S_FLICKY_14_FLAP3, 0},
+	{"FLICKY_14_FLAP3", 0, SPR_FL14, 3, 3, {A_FlickySoar},         4*FRACUNIT,       32*FRACUNIT, S_FLICKY_14_FLAP1, 0},
+	{"FLICKY_14_STAND", 0, SPR_FL14, FF_ANIMATE|1, -1, {NULL}, 2, 3, S_NULL, 0},
+	{"FLICKY_14_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_14, 384*FRACUNIT, S_FLICKY_14_CENTER, 0},
 
 	// Cat
-	{"S_FLICKY_15_OUT", 0, SPR_FL15, 0, 2, {A_FlickyCheck}, S_FLICKY_15_AIM,                0, S_FLICKY_15_OUT, 0},
-	{"S_FLICKY_15_AIM", 0, SPR_FL15, 1, 1, {A_FlickyAim},             ANG30,      32*FRACUNIT, S_FLICKY_15_HOP, 0},
-	{"S_FLICKY_15_HOP", 0, SPR_FL15, 1, 1, {A_FlickyFlounder},   2*FRACUNIT,       6*FRACUNIT, S_FLICKY_15_UP, 0},
-	{"S_FLICKY_15_UP", 0, SPR_FL15, 2, 2, {A_FlickyCheck}, S_FLICKY_15_AIM, S_FLICKY_15_DOWN, S_FLICKY_15_UP, 0},
-	{"S_FLICKY_15_DOWN", 0, SPR_FL15, 3, 2, {A_FlickyCheck}, S_FLICKY_15_AIM,                0, S_FLICKY_15_DOWN, 0},
-	{"S_FLICKY_15_STAND", 0, SPR_FL15, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_FLICKY_15_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_15, 384*FRACUNIT, S_FLICKY_15_CENTER, 0},
+	{"FLICKY_15_OUT", 0, SPR_FL15, 0, 2, {A_FlickyCheck}, S_FLICKY_15_AIM,                0, S_FLICKY_15_OUT, 0},
+	{"FLICKY_15_AIM", 0, SPR_FL15, 1, 1, {A_FlickyAim},             ANG30,      32*FRACUNIT, S_FLICKY_15_HOP, 0},
+	{"FLICKY_15_HOP", 0, SPR_FL15, 1, 1, {A_FlickyFlounder},   2*FRACUNIT,       6*FRACUNIT, S_FLICKY_15_UP, 0},
+	{"FLICKY_15_UP", 0, SPR_FL15, 2, 2, {A_FlickyCheck}, S_FLICKY_15_AIM, S_FLICKY_15_DOWN, S_FLICKY_15_UP, 0},
+	{"FLICKY_15_DOWN", 0, SPR_FL15, 3, 2, {A_FlickyCheck}, S_FLICKY_15_AIM,                0, S_FLICKY_15_DOWN, 0},
+	{"FLICKY_15_STAND", 0, SPR_FL15, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"FLICKY_15_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_15, 384*FRACUNIT, S_FLICKY_15_CENTER, 0},
 
 	// Canary
-	{"S_FLICKY_16_OUT", 0, SPR_FL16, 0, 2, {A_FlickyHeightCheck}, S_FLICKY_16_FLAP1,          0, S_FLICKY_16_OUT, 0},
-	{"S_FLICKY_16_FLAP1", 0, SPR_FL16, 1, 3, {A_FlickyFly},                4*FRACUNIT, 8*FRACUNIT, S_FLICKY_16_FLAP2, 0},
-	{"S_FLICKY_16_FLAP2", 0, SPR_FL16, 2, 3, {A_SetObjectFlags},         MF_NOGRAVITY,          1, S_FLICKY_16_FLAP3, 0},
-	{"S_FLICKY_16_FLAP3", 0, SPR_FL16, 3, 3, {A_FlickyHeightCheck}, S_FLICKY_16_FLAP1,          0, S_FLICKY_16_FLAP3, 0},
-	{"S_FLICKY_16_STAND", 0, SPR_FL16, FF_ANIMATE|1, -1, {NULL}, 2, 3, S_NULL, 0},
-	{"S_FLICKY_16_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_16, 384*FRACUNIT, S_FLICKY_16_CENTER, 0},
+	{"FLICKY_16_OUT", 0, SPR_FL16, 0, 2, {A_FlickyHeightCheck}, S_FLICKY_16_FLAP1,          0, S_FLICKY_16_OUT, 0},
+	{"FLICKY_16_FLAP1", 0, SPR_FL16, 1, 3, {A_FlickyFly},                4*FRACUNIT, 8*FRACUNIT, S_FLICKY_16_FLAP2, 0},
+	{"FLICKY_16_FLAP2", 0, SPR_FL16, 2, 3, {A_SetObjectFlags},         MF_NOGRAVITY,          1, S_FLICKY_16_FLAP3, 0},
+	{"FLICKY_16_FLAP3", 0, SPR_FL16, 3, 3, {A_FlickyHeightCheck}, S_FLICKY_16_FLAP1,          0, S_FLICKY_16_FLAP3, 0},
+	{"FLICKY_16_STAND", 0, SPR_FL16, FF_ANIMATE|1, -1, {NULL}, 2, 3, S_NULL, 0},
+	{"FLICKY_16_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_FLICKY_16, 384*FRACUNIT, S_FLICKY_16_CENTER, 0},
 
 	// Spider
-	{"S_SECRETFLICKY_01_OUT", 0, SPR_FS01, 0, 2, {A_FlickyCheck}, S_SECRETFLICKY_01_AIM,                      0, S_SECRETFLICKY_01_OUT, 0},
-	{"S_SECRETFLICKY_01_AIM", 0, SPR_FS01, 1, 1, {A_FlickyAim},                   ANG30,            32*FRACUNIT, S_SECRETFLICKY_01_HOP, 0},
-	{"S_SECRETFLICKY_01_HOP", 0, SPR_FS01, 1, 1, {A_FlickyFlounder},         2*FRACUNIT,             6*FRACUNIT, S_SECRETFLICKY_01_UP, 0},
-	{"S_SECRETFLICKY_01_UP", 0, SPR_FS01, 2, 2, {A_FlickyCheck}, S_SECRETFLICKY_01_AIM, S_SECRETFLICKY_01_DOWN, S_SECRETFLICKY_01_UP, 0},
-	{"S_SECRETFLICKY_01_DOWN", 0, SPR_FS01, 3, 2, {A_FlickyCheck}, S_SECRETFLICKY_01_AIM,                      0, S_SECRETFLICKY_01_DOWN, 0},
-	{"S_SECRETFLICKY_01_STAND", 0, SPR_FS01, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
-	{"S_SECRETFLICKY_01_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_SECRETFLICKY_01, 384*FRACUNIT, S_SECRETFLICKY_01_CENTER, 0},
+	{"SECRETFLICKY_01_OUT", 0, SPR_FS01, 0, 2, {A_FlickyCheck}, S_SECRETFLICKY_01_AIM,                      0, S_SECRETFLICKY_01_OUT, 0},
+	{"SECRETFLICKY_01_AIM", 0, SPR_FS01, 1, 1, {A_FlickyAim},                   ANG30,            32*FRACUNIT, S_SECRETFLICKY_01_HOP, 0},
+	{"SECRETFLICKY_01_HOP", 0, SPR_FS01, 1, 1, {A_FlickyFlounder},         2*FRACUNIT,             6*FRACUNIT, S_SECRETFLICKY_01_UP, 0},
+	{"SECRETFLICKY_01_UP", 0, SPR_FS01, 2, 2, {A_FlickyCheck}, S_SECRETFLICKY_01_AIM, S_SECRETFLICKY_01_DOWN, S_SECRETFLICKY_01_UP, 0},
+	{"SECRETFLICKY_01_DOWN", 0, SPR_FS01, 3, 2, {A_FlickyCheck}, S_SECRETFLICKY_01_AIM,                      0, S_SECRETFLICKY_01_DOWN, 0},
+	{"SECRETFLICKY_01_STAND", 0, SPR_FS01, FF_ANIMATE|1, -1, {NULL}, 2, 4, S_NULL, 0},
+	{"SECRETFLICKY_01_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_SECRETFLICKY_01, 384*FRACUNIT, S_SECRETFLICKY_01_CENTER, 0},
 
 	// Bat
-	{"S_SECRETFLICKY_02_OUT", 0, SPR_FS02, 0, 2, {A_FlickyHeightCheck}, S_SECRETFLICKY_02_FLAP1, S_SECRETFLICKY_02_FLAP1, S_SECRETFLICKY_02_OUT, 0},
-	{"S_SECRETFLICKY_02_FLAP1", 0, SPR_FS02, 1, 3, {A_FlickyFly},                      4*FRACUNIT,             16*FRACUNIT, S_SECRETFLICKY_02_FLAP2, 0},
-	{"S_SECRETFLICKY_02_FLAP2", 0, SPR_FS02, 2, 3, {A_FlickyFly},                      4*FRACUNIT,             16*FRACUNIT, S_SECRETFLICKY_02_FLAP3, 0},
-	{"S_SECRETFLICKY_02_FLAP3", 0, SPR_FS02, 3, 3, {A_FlickyFly},                      4*FRACUNIT,             16*FRACUNIT, S_SECRETFLICKY_02_FLAP1, 0},
-	{"S_SECRETFLICKY_02_STAND", 0, SPR_FS02, FF_ANIMATE|1, -1, {NULL}, 2, 2, S_NULL, 0},
-	{"S_SECRETFLICKY_02_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_SECRETFLICKY_02, 384*FRACUNIT, S_SECRETFLICKY_02_CENTER, 0},
+	{"SECRETFLICKY_02_OUT", 0, SPR_FS02, 0, 2, {A_FlickyHeightCheck}, S_SECRETFLICKY_02_FLAP1, S_SECRETFLICKY_02_FLAP1, S_SECRETFLICKY_02_OUT, 0},
+	{"SECRETFLICKY_02_FLAP1", 0, SPR_FS02, 1, 3, {A_FlickyFly},                      4*FRACUNIT,             16*FRACUNIT, S_SECRETFLICKY_02_FLAP2, 0},
+	{"SECRETFLICKY_02_FLAP2", 0, SPR_FS02, 2, 3, {A_FlickyFly},                      4*FRACUNIT,             16*FRACUNIT, S_SECRETFLICKY_02_FLAP3, 0},
+	{"SECRETFLICKY_02_FLAP3", 0, SPR_FS02, 3, 3, {A_FlickyFly},                      4*FRACUNIT,             16*FRACUNIT, S_SECRETFLICKY_02_FLAP1, 0},
+	{"SECRETFLICKY_02_STAND", 0, SPR_FS02, FF_ANIMATE|1, -1, {NULL}, 2, 2, S_NULL, 0},
+	{"SECRETFLICKY_02_CENTER", 0, SPR_NULL, 0, 15, {A_FlickyCenter}, MT_SECRETFLICKY_02, 384*FRACUNIT, S_SECRETFLICKY_02_CENTER, 0},
 
 	// Fan
-	{"S_FAN", 0, SPR_FANS, 0, 1, {A_FanBubbleSpawn}, 2048, 0, S_FAN2, 0},
-	{"S_FAN2", 0, SPR_FANS, 1, 1, {A_FanBubbleSpawn}, 1024, 0, S_FAN3, 0},
-	{"S_FAN3", 0, SPR_FANS, 2, 1, {A_FanBubbleSpawn},  512, 0, S_FAN4, 0},
-	{"S_FAN4", 0, SPR_FANS, 3, 1, {A_FanBubbleSpawn}, 1024, 0, S_FAN5, 0},
-	{"S_FAN5", 0, SPR_FANS, 4, 1, {A_FanBubbleSpawn},  512, 0, S_FAN, 0},
+	{"FAN", 0, SPR_FANS, 0, 1, {A_FanBubbleSpawn}, 2048, 0, S_FAN2, 0},
+	{"FAN2", 0, SPR_FANS, 1, 1, {A_FanBubbleSpawn}, 1024, 0, S_FAN3, 0},
+	{"FAN3", 0, SPR_FANS, 2, 1, {A_FanBubbleSpawn},  512, 0, S_FAN4, 0},
+	{"FAN4", 0, SPR_FANS, 3, 1, {A_FanBubbleSpawn}, 1024, 0, S_FAN5, 0},
+	{"FAN5", 0, SPR_FANS, 4, 1, {A_FanBubbleSpawn},  512, 0, S_FAN, 0},
 
 	// Steam Riser
-	{"S_STEAM1", 0, SPR_STEM, 0, 2, {A_SetSolidSteam}, 0, 0, S_STEAM2, 0},
-	{"S_STEAM2", 0, SPR_STEM, 1, 2, {A_UnsetSolidSteam}, 0, 0, S_STEAM3, 0},
-	{"S_STEAM3", 0, SPR_STEM, 2, 2, {NULL}, 0, 0, S_STEAM4, 0},
-	{"S_STEAM4", 0, SPR_STEM, 3, 2, {NULL}, 0, 0, S_STEAM5, 0},
-	{"S_STEAM5", 0, SPR_STEM, 4, 2, {NULL}, 0, 0, S_STEAM6, 0},
-	{"S_STEAM6", 0, SPR_STEM, 5, 2, {NULL}, 0, 0, S_STEAM7, 0},
-	{"S_STEAM7", 0, SPR_STEM, 6, 2, {NULL}, 0, 0, S_STEAM8, 0},
-	{"S_STEAM8", 0, SPR_NULL, 0, 18, {NULL}, 0, 0, S_STEAM1, 0},
+	{"STEAM1", 0, SPR_STEM, 0, 2, {A_SetSolidSteam}, 0, 0, S_STEAM2, 0},
+	{"STEAM2", 0, SPR_STEM, 1, 2, {A_UnsetSolidSteam}, 0, 0, S_STEAM3, 0},
+	{"STEAM3", 0, SPR_STEM, 2, 2, {NULL}, 0, 0, S_STEAM4, 0},
+	{"STEAM4", 0, SPR_STEM, 3, 2, {NULL}, 0, 0, S_STEAM5, 0},
+	{"STEAM5", 0, SPR_STEM, 4, 2, {NULL}, 0, 0, S_STEAM6, 0},
+	{"STEAM6", 0, SPR_STEM, 5, 2, {NULL}, 0, 0, S_STEAM7, 0},
+	{"STEAM7", 0, SPR_STEM, 6, 2, {NULL}, 0, 0, S_STEAM8, 0},
+	{"STEAM8", 0, SPR_NULL, 0, 18, {NULL}, 0, 0, S_STEAM1, 0},
 
 	// Bumpers
-	{"S_BUMPER", 0, SPR_BUMP, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL},   3, 4, S_NULL, 0},
-	{"S_BUMPERHIT", 0, SPR_BUMP, FF_ANIMATE|4,             12, {A_Pain}, 1, 3, S_BUMPER, 0},
+	{"BUMPER", 0, SPR_BUMP, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL},   3, 4, S_NULL, 0},
+	{"BUMPERHIT", 0, SPR_BUMP, FF_ANIMATE|4,             12, {A_Pain}, 1, 3, S_BUMPER, 0},
 
 	// Balloons
-	{"S_BALLOON", 0, SPR_BLON, FF_ANIMATE, -1, {NULL}, 2, 5, S_NULL, 0},
-	{"S_BALLOONPOP1", 0, SPR_BLON, 3, 0, {A_RemoteDamage},   0, 1, S_BALLOONPOP2, 0},
-	{"S_BALLOONPOP2", 0, SPR_BLON, 3, 1, {A_Pain},           0, 0, S_BALLOONPOP3, 0},
-	{"S_BALLOONPOP3", 0, SPR_BLON, 4, 1, {NULL},             0, 0, S_BALLOONPOP4, 0},
-	{"S_BALLOONPOP4", 0, SPR_NULL, 0, TICRATE, {A_CheckFlags2}, MF2_AMBUSH, S_BALLOONPOP5, S_NULL, 0},
-	{"S_BALLOONPOP5", 0, SPR_NULL, 0, 15*TICRATE, {NULL},    0, 0, S_BALLOONPOP6, 0},
-	{"S_BALLOONPOP6", 0, SPR_NULL, 0, 0, {A_SpawnFreshCopy}, 0, 0, S_NULL, 0},
+	{"BALLOON", 0, SPR_BLON, FF_ANIMATE, -1, {NULL}, 2, 5, S_NULL, 0},
+	{"BALLOONPOP1", 0, SPR_BLON, 3, 0, {A_RemoteDamage},   0, 1, S_BALLOONPOP2, 0},
+	{"BALLOONPOP2", 0, SPR_BLON, 3, 1, {A_Pain},           0, 0, S_BALLOONPOP3, 0},
+	{"BALLOONPOP3", 0, SPR_BLON, 4, 1, {NULL},             0, 0, S_BALLOONPOP4, 0},
+	{"BALLOONPOP4", 0, SPR_NULL, 0, TICRATE, {A_CheckFlags2}, MF2_AMBUSH, S_BALLOONPOP5, S_NULL, 0},
+	{"BALLOONPOP5", 0, SPR_NULL, 0, 15*TICRATE, {NULL},    0, 0, S_BALLOONPOP6, 0},
+	{"BALLOONPOP6", 0, SPR_NULL, 0, 0, {A_SpawnFreshCopy}, 0, 0, S_NULL, 0},
 
 	// Yellow Spring
-	{"S_YELLOWSPRING", 0, SPR_SPRY, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_YELLOWSPRING2", 0, SPR_SPRY, 4, 4, {A_Pain}, 0, 0, S_YELLOWSPRING3, 0},
-	{"S_YELLOWSPRING3", 0, SPR_SPRY, 3, 1, {NULL}, 0, 0, S_YELLOWSPRING4, 0},
-	{"S_YELLOWSPRING4", 0, SPR_SPRY, 2, 1, {NULL}, 0, 0, S_YELLOWSPRING5, 0},
-	{"S_YELLOWSPRING5", 0, SPR_SPRY, 1, 1, {NULL}, 0, 0, S_YELLOWSPRING, 0},
+	{"YELLOWSPRING", 0, SPR_SPRY, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"YELLOWSPRING2", 0, SPR_SPRY, 4, 4, {A_Pain}, 0, 0, S_YELLOWSPRING3, 0},
+	{"YELLOWSPRING3", 0, SPR_SPRY, 3, 1, {NULL}, 0, 0, S_YELLOWSPRING4, 0},
+	{"YELLOWSPRING4", 0, SPR_SPRY, 2, 1, {NULL}, 0, 0, S_YELLOWSPRING5, 0},
+	{"YELLOWSPRING5", 0, SPR_SPRY, 1, 1, {NULL}, 0, 0, S_YELLOWSPRING, 0},
 
 	// Red Spring
-	{"S_REDSPRING", 0, SPR_SPRR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_REDSPRING2", 0, SPR_SPRR, 4, 4, {A_Pain}, 0, 0, S_REDSPRING3, 0},
-	{"S_REDSPRING3", 0, SPR_SPRR, 3, 1, {NULL}, 0, 0, S_REDSPRING4, 0},
-	{"S_REDSPRING4", 0, SPR_SPRR, 2, 1, {NULL}, 0, 0, S_REDSPRING5, 0},
-	{"S_REDSPRING5", 0, SPR_SPRR, 1, 1, {NULL}, 0, 0, S_REDSPRING, 0},
+	{"REDSPRING", 0, SPR_SPRR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"REDSPRING2", 0, SPR_SPRR, 4, 4, {A_Pain}, 0, 0, S_REDSPRING3, 0},
+	{"REDSPRING3", 0, SPR_SPRR, 3, 1, {NULL}, 0, 0, S_REDSPRING4, 0},
+	{"REDSPRING4", 0, SPR_SPRR, 2, 1, {NULL}, 0, 0, S_REDSPRING5, 0},
+	{"REDSPRING5", 0, SPR_SPRR, 1, 1, {NULL}, 0, 0, S_REDSPRING, 0},
 
 	// Blue Spring
-	{"S_BLUESPRING", 0, SPR_SPRB, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BLUESPRING2", 0, SPR_SPRB, 4, 4, {A_Pain}, 0, 0, S_BLUESPRING3, 0},
-	{"S_BLUESPRING3", 0, SPR_SPRB, 3, 1, {NULL}, 0, 0, S_BLUESPRING4, 0},
-	{"S_BLUESPRING4", 0, SPR_SPRB, 2, 1, {NULL}, 0, 0, S_BLUESPRING5, 0},
-	{"S_BLUESPRING5", 0, SPR_SPRB, 1, 1, {NULL}, 0, 0, S_BLUESPRING, 0},
+	{"BLUESPRING", 0, SPR_SPRB, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BLUESPRING2", 0, SPR_SPRB, 4, 4, {A_Pain}, 0, 0, S_BLUESPRING3, 0},
+	{"BLUESPRING3", 0, SPR_SPRB, 3, 1, {NULL}, 0, 0, S_BLUESPRING4, 0},
+	{"BLUESPRING4", 0, SPR_SPRB, 2, 1, {NULL}, 0, 0, S_BLUESPRING5, 0},
+	{"BLUESPRING5", 0, SPR_SPRB, 1, 1, {NULL}, 0, 0, S_BLUESPRING, 0},
 
 	// Yellow Diagonal Spring
-	{"S_YDIAG1", 0, SPR_YSPR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_YDIAG2", 0, SPR_YSPR, 1, 1, {A_Pain}, 0, 0, S_YDIAG3, 0},
-	{"S_YDIAG3", 0, SPR_YSPR, 2, 1, {NULL}, 0, 0, S_YDIAG4, 0},
-	{"S_YDIAG4", 0, SPR_YSPR, 3, 1, {NULL}, 0, 0, S_YDIAG5, 0},
-	{"S_YDIAG5", 0, SPR_YSPR, 4, 1, {NULL}, 0, 0, S_YDIAG6, 0},
-	{"S_YDIAG6", 0, SPR_YSPR, 3, 1, {NULL}, 0, 0, S_YDIAG7, 0},
-	{"S_YDIAG7", 0, SPR_YSPR, 2, 1, {NULL}, 0, 0, S_YDIAG8, 0},
-	{"S_YDIAG8", 0, SPR_YSPR, 1, 1, {NULL}, 0, 0, S_YDIAG1, 0},
+	{"YDIAG1", 0, SPR_YSPR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"YDIAG2", 0, SPR_YSPR, 1, 1, {A_Pain}, 0, 0, S_YDIAG3, 0},
+	{"YDIAG3", 0, SPR_YSPR, 2, 1, {NULL}, 0, 0, S_YDIAG4, 0},
+	{"YDIAG4", 0, SPR_YSPR, 3, 1, {NULL}, 0, 0, S_YDIAG5, 0},
+	{"YDIAG5", 0, SPR_YSPR, 4, 1, {NULL}, 0, 0, S_YDIAG6, 0},
+	{"YDIAG6", 0, SPR_YSPR, 3, 1, {NULL}, 0, 0, S_YDIAG7, 0},
+	{"YDIAG7", 0, SPR_YSPR, 2, 1, {NULL}, 0, 0, S_YDIAG8, 0},
+	{"YDIAG8", 0, SPR_YSPR, 1, 1, {NULL}, 0, 0, S_YDIAG1, 0},
 
 	// Red Diagonal Spring
-	{"S_RDIAG1", 0, SPR_RSPR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_RDIAG2", 0, SPR_RSPR, 1, 1, {A_Pain}, 0, 0, S_RDIAG3, 0},
-	{"S_RDIAG3", 0, SPR_RSPR, 2, 1, {NULL}, 0, 0, S_RDIAG4, 0},
-	{"S_RDIAG4", 0, SPR_RSPR, 3, 1, {NULL}, 0, 0, S_RDIAG5, 0},
-	{"S_RDIAG5", 0, SPR_RSPR, 4, 1, {NULL}, 0, 0, S_RDIAG6, 0},
-	{"S_RDIAG6", 0, SPR_RSPR, 3, 1, {NULL}, 0, 0, S_RDIAG7, 0},
-	{"S_RDIAG7", 0, SPR_RSPR, 2, 1, {NULL}, 0, 0, S_RDIAG8, 0},
-	{"S_RDIAG8", 0, SPR_RSPR, 1, 1, {NULL}, 0, 0, S_RDIAG1, 0},
+	{"RDIAG1", 0, SPR_RSPR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"RDIAG2", 0, SPR_RSPR, 1, 1, {A_Pain}, 0, 0, S_RDIAG3, 0},
+	{"RDIAG3", 0, SPR_RSPR, 2, 1, {NULL}, 0, 0, S_RDIAG4, 0},
+	{"RDIAG4", 0, SPR_RSPR, 3, 1, {NULL}, 0, 0, S_RDIAG5, 0},
+	{"RDIAG5", 0, SPR_RSPR, 4, 1, {NULL}, 0, 0, S_RDIAG6, 0},
+	{"RDIAG6", 0, SPR_RSPR, 3, 1, {NULL}, 0, 0, S_RDIAG7, 0},
+	{"RDIAG7", 0, SPR_RSPR, 2, 1, {NULL}, 0, 0, S_RDIAG8, 0},
+	{"RDIAG8", 0, SPR_RSPR, 1, 1, {NULL}, 0, 0, S_RDIAG1, 0},
 
 	// Blue Diagonal Spring
-	{"S_BDIAG1", 0, SPR_BSPR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BDIAG2", 0, SPR_BSPR, 1, 1, {A_Pain}, 0, 0, S_BDIAG3, 0},
-	{"S_BDIAG3", 0, SPR_BSPR, 2, 1, {NULL}, 0, 0, S_BDIAG4, 0},
-	{"S_BDIAG4", 0, SPR_BSPR, 3, 1, {NULL}, 0, 0, S_BDIAG5, 0},
-	{"S_BDIAG5", 0, SPR_BSPR, 4, 1, {NULL}, 0, 0, S_BDIAG6, 0},
-	{"S_BDIAG6", 0, SPR_BSPR, 3, 1, {NULL}, 0, 0, S_BDIAG7, 0},
-	{"S_BDIAG7", 0, SPR_BSPR, 2, 1, {NULL}, 0, 0, S_BDIAG8, 0},
-	{"S_BDIAG8", 0, SPR_BSPR, 1, 1, {NULL}, 0, 0, S_BDIAG1, 0},
+	{"BDIAG1", 0, SPR_BSPR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BDIAG2", 0, SPR_BSPR, 1, 1, {A_Pain}, 0, 0, S_BDIAG3, 0},
+	{"BDIAG3", 0, SPR_BSPR, 2, 1, {NULL}, 0, 0, S_BDIAG4, 0},
+	{"BDIAG4", 0, SPR_BSPR, 3, 1, {NULL}, 0, 0, S_BDIAG5, 0},
+	{"BDIAG5", 0, SPR_BSPR, 4, 1, {NULL}, 0, 0, S_BDIAG6, 0},
+	{"BDIAG6", 0, SPR_BSPR, 3, 1, {NULL}, 0, 0, S_BDIAG7, 0},
+	{"BDIAG7", 0, SPR_BSPR, 2, 1, {NULL}, 0, 0, S_BDIAG8, 0},
+	{"BDIAG8", 0, SPR_BSPR, 1, 1, {NULL}, 0, 0, S_BDIAG1, 0},
 
 	// Yellow Side Spring
-	{"S_YHORIZ1", 0, SPR_SSWY, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_YHORIZ2", 0, SPR_SSWY, 1, 1, {A_Pain}, 0, 0, S_YHORIZ3, 0},
-	{"S_YHORIZ3", 0, SPR_SSWY, 2, 1, {NULL}, 0, 0, S_YHORIZ4, 0},
-	{"S_YHORIZ4", 0, SPR_SSWY, 3, 1, {NULL}, 0, 0, S_YHORIZ5, 0},
-	{"S_YHORIZ5", 0, SPR_SSWY, 4, 1, {NULL}, 0, 0, S_YHORIZ6, 0},
-	{"S_YHORIZ6", 0, SPR_SSWY, 3, 1, {NULL}, 0, 0, S_YHORIZ7, 0},
-	{"S_YHORIZ7", 0, SPR_SSWY, 2, 1, {NULL}, 0, 0, S_YHORIZ8, 0},
-	{"S_YHORIZ8", 0, SPR_SSWY, 1, 1, {NULL}, 0, 0, S_YHORIZ1, 0},
+	{"YHORIZ1", 0, SPR_SSWY, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"YHORIZ2", 0, SPR_SSWY, 1, 1, {A_Pain}, 0, 0, S_YHORIZ3, 0},
+	{"YHORIZ3", 0, SPR_SSWY, 2, 1, {NULL}, 0, 0, S_YHORIZ4, 0},
+	{"YHORIZ4", 0, SPR_SSWY, 3, 1, {NULL}, 0, 0, S_YHORIZ5, 0},
+	{"YHORIZ5", 0, SPR_SSWY, 4, 1, {NULL}, 0, 0, S_YHORIZ6, 0},
+	{"YHORIZ6", 0, SPR_SSWY, 3, 1, {NULL}, 0, 0, S_YHORIZ7, 0},
+	{"YHORIZ7", 0, SPR_SSWY, 2, 1, {NULL}, 0, 0, S_YHORIZ8, 0},
+	{"YHORIZ8", 0, SPR_SSWY, 1, 1, {NULL}, 0, 0, S_YHORIZ1, 0},
 
 	// Red Side Spring
-	{"S_RHORIZ1", 0, SPR_SSWR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_RHORIZ2", 0, SPR_SSWR, 1, 1, {A_Pain}, 0, 0, S_RHORIZ3, 0},
-	{"S_RHORIZ3", 0, SPR_SSWR, 2, 1, {NULL}, 0, 0, S_RHORIZ4, 0},
-	{"S_RHORIZ4", 0, SPR_SSWR, 3, 1, {NULL}, 0, 0, S_RHORIZ5, 0},
-	{"S_RHORIZ5", 0, SPR_SSWR, 4, 1, {NULL}, 0, 0, S_RHORIZ6, 0},
-	{"S_RHORIZ6", 0, SPR_SSWR, 3, 1, {NULL}, 0, 0, S_RHORIZ7, 0},
-	{"S_RHORIZ7", 0, SPR_SSWR, 2, 1, {NULL}, 0, 0, S_RHORIZ8, 0},
-	{"S_RHORIZ8", 0, SPR_SSWR, 1, 1, {NULL}, 0, 0, S_RHORIZ1, 0},
+	{"RHORIZ1", 0, SPR_SSWR, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"RHORIZ2", 0, SPR_SSWR, 1, 1, {A_Pain}, 0, 0, S_RHORIZ3, 0},
+	{"RHORIZ3", 0, SPR_SSWR, 2, 1, {NULL}, 0, 0, S_RHORIZ4, 0},
+	{"RHORIZ4", 0, SPR_SSWR, 3, 1, {NULL}, 0, 0, S_RHORIZ5, 0},
+	{"RHORIZ5", 0, SPR_SSWR, 4, 1, {NULL}, 0, 0, S_RHORIZ6, 0},
+	{"RHORIZ6", 0, SPR_SSWR, 3, 1, {NULL}, 0, 0, S_RHORIZ7, 0},
+	{"RHORIZ7", 0, SPR_SSWR, 2, 1, {NULL}, 0, 0, S_RHORIZ8, 0},
+	{"RHORIZ8", 0, SPR_SSWR, 1, 1, {NULL}, 0, 0, S_RHORIZ1, 0},
 
 	// Blue Side Spring
-	{"S_BHORIZ1", 0, SPR_SSWB, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BHORIZ2", 0, SPR_SSWB, 1, 1, {A_Pain}, 0, 0, S_BHORIZ3, 0},
-	{"S_BHORIZ3", 0, SPR_SSWB, 2, 1, {NULL}, 0, 0, S_BHORIZ4, 0},
-	{"S_BHORIZ4", 0, SPR_SSWB, 3, 1, {NULL}, 0, 0, S_BHORIZ5, 0},
-	{"S_BHORIZ5", 0, SPR_SSWB, 4, 1, {NULL}, 0, 0, S_BHORIZ6, 0},
-	{"S_BHORIZ6", 0, SPR_SSWB, 3, 1, {NULL}, 0, 0, S_BHORIZ7, 0},
-	{"S_BHORIZ7", 0, SPR_SSWB, 2, 1, {NULL}, 0, 0, S_BHORIZ8, 0},
-	{"S_BHORIZ8", 0, SPR_SSWB, 1, 1, {NULL}, 0, 0, S_BHORIZ1, 0},
+	{"BHORIZ1", 0, SPR_SSWB, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BHORIZ2", 0, SPR_SSWB, 1, 1, {A_Pain}, 0, 0, S_BHORIZ3, 0},
+	{"BHORIZ3", 0, SPR_SSWB, 2, 1, {NULL}, 0, 0, S_BHORIZ4, 0},
+	{"BHORIZ4", 0, SPR_SSWB, 3, 1, {NULL}, 0, 0, S_BHORIZ5, 0},
+	{"BHORIZ5", 0, SPR_SSWB, 4, 1, {NULL}, 0, 0, S_BHORIZ6, 0},
+	{"BHORIZ6", 0, SPR_SSWB, 3, 1, {NULL}, 0, 0, S_BHORIZ7, 0},
+	{"BHORIZ7", 0, SPR_SSWB, 2, 1, {NULL}, 0, 0, S_BHORIZ8, 0},
+	{"BHORIZ8", 0, SPR_SSWB, 1, 1, {NULL}, 0, 0, S_BHORIZ1, 0},
 
 	// Boosters
-	{"S_BOOSTERSOUND", 0, SPR_NULL, 0, 1, {A_Pain}, 0, 0, S_INVISIBLE, 0},
-	{"S_YELLOWBOOSTERROLLER", 0, SPR_BSTY,                  FF_ANIMATE, -1, {NULL}, 2, 1, S_NULL, 0},
-	{"S_YELLOWBOOSTERSEG_LEFT", 0, SPR_BSTY, 3|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 2, 3, S_NULL, 0},
-	{"S_YELLOWBOOSTERSEG_RIGHT", 0, SPR_BSTY, 6|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 2, 3, S_NULL, 0},
-	{"S_YELLOWBOOSTERSEG_FACE", 0, SPR_BSTY, 9|FF_PAPERSPRITE,            -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_REDBOOSTERROLLER", 0, SPR_BSTR,                  FF_ANIMATE, -1, {NULL}, 2, 1, S_NULL, 0},
-	{"S_REDBOOSTERSEG_LEFT", 0, SPR_BSTR, 3|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 2, 3, S_NULL, 0},
-	{"S_REDBOOSTERSEG_RIGHT", 0, SPR_BSTR, 6|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 2, 3, S_NULL, 0},
-	{"S_REDBOOSTERSEG_FACE", 0, SPR_BSTR, 9|FF_PAPERSPRITE,            -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BOOSTERSOUND", 0, SPR_NULL, 0, 1, {A_Pain}, 0, 0, S_INVISIBLE, 0},
+	{"YELLOWBOOSTERROLLER", 0, SPR_BSTY,                  FF_ANIMATE, -1, {NULL}, 2, 1, S_NULL, 0},
+	{"YELLOWBOOSTERSEG_LEFT", 0, SPR_BSTY, 3|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 2, 3, S_NULL, 0},
+	{"YELLOWBOOSTERSEG_RIGHT", 0, SPR_BSTY, 6|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 2, 3, S_NULL, 0},
+	{"YELLOWBOOSTERSEG_FACE", 0, SPR_BSTY, 9|FF_PAPERSPRITE,            -1, {NULL}, 0, 0, S_NULL, 0},
+	{"REDBOOSTERROLLER", 0, SPR_BSTR,                  FF_ANIMATE, -1, {NULL}, 2, 1, S_NULL, 0},
+	{"REDBOOSTERSEG_LEFT", 0, SPR_BSTR, 3|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 2, 3, S_NULL, 0},
+	{"REDBOOSTERSEG_RIGHT", 0, SPR_BSTR, 6|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 2, 3, S_NULL, 0},
+	{"REDBOOSTERSEG_FACE", 0, SPR_BSTR, 9|FF_PAPERSPRITE,            -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Rain
-	{"S_RAIN1", 0, SPR_RAIN, FF_FULLBRIGHT|FF_TRANS50, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_RAINRETURN", 0, SPR_RAIN, FF_FULLBRIGHT|FF_TRANS50, 1, {NULL}, 0, 0, S_RAIN1, 0},
+	{"RAIN1", 0, SPR_RAIN, FF_FULLBRIGHT|FF_TRANS50, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"RAINRETURN", 0, SPR_RAIN, FF_FULLBRIGHT|FF_TRANS50, 1, {NULL}, 0, 0, S_RAIN1, 0},
 
 	// Snowflake
-	{"S_SNOW1", 0, SPR_SNO1, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_SNOW2", 0, SPR_SNO1, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_SNOW3", 0, SPR_SNO1, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SNOW1", 0, SPR_SNO1, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SNOW2", 0, SPR_SNO1, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SNOW3", 0, SPR_SNO1, 2, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Water Splish
-	{"S_SPLISH1", 0, SPR_SPLH, FF_TRANS50  , 2, {NULL}, 0, 0, S_SPLISH2, 0},
-	{"S_SPLISH2", 0, SPR_SPLH, FF_TRANS50|1, 2, {NULL}, 0, 0, S_SPLISH3, 0},
-	{"S_SPLISH3", 0, SPR_SPLH, FF_TRANS50|2, 2, {NULL}, 0, 0, S_SPLISH4, 0},
-	{"S_SPLISH4", 0, SPR_SPLH, FF_TRANS50|3, 2, {NULL}, 0, 0, S_SPLISH5, 0},
-	{"S_SPLISH5", 0, SPR_SPLH, FF_TRANS50|4, 2, {NULL}, 0, 0, S_SPLISH6, 0},
-	{"S_SPLISH6", 0, SPR_SPLH, FF_TRANS50|5, 2, {NULL}, 0, 0, S_SPLISH7, 0},
-	{"S_SPLISH7", 0, SPR_SPLH, FF_TRANS50|6, 2, {NULL}, 0, 0, S_SPLISH8, 0},
-	{"S_SPLISH8", 0, SPR_SPLH, FF_TRANS50|7, 2, {NULL}, 0, 0, S_SPLISH9, 0},
-	{"S_SPLISH9", 0, SPR_SPLH, FF_TRANS50|8, 2, {NULL}, 0, 0, S_NULL, 0},
+	{"SPLISH1", 0, SPR_SPLH, FF_TRANS50  , 2, {NULL}, 0, 0, S_SPLISH2, 0},
+	{"SPLISH2", 0, SPR_SPLH, FF_TRANS50|1, 2, {NULL}, 0, 0, S_SPLISH3, 0},
+	{"SPLISH3", 0, SPR_SPLH, FF_TRANS50|2, 2, {NULL}, 0, 0, S_SPLISH4, 0},
+	{"SPLISH4", 0, SPR_SPLH, FF_TRANS50|3, 2, {NULL}, 0, 0, S_SPLISH5, 0},
+	{"SPLISH5", 0, SPR_SPLH, FF_TRANS50|4, 2, {NULL}, 0, 0, S_SPLISH6, 0},
+	{"SPLISH6", 0, SPR_SPLH, FF_TRANS50|5, 2, {NULL}, 0, 0, S_SPLISH7, 0},
+	{"SPLISH7", 0, SPR_SPLH, FF_TRANS50|6, 2, {NULL}, 0, 0, S_SPLISH8, 0},
+	{"SPLISH8", 0, SPR_SPLH, FF_TRANS50|7, 2, {NULL}, 0, 0, S_SPLISH9, 0},
+	{"SPLISH9", 0, SPR_SPLH, FF_TRANS50|8, 2, {NULL}, 0, 0, S_NULL, 0},
 
 	// Lava splish
-	{"S_LAVASPLISH", 0, SPR_LSPL, FF_ANIMATE, 16, {NULL}, 7, 2, S_NULL, 0},
+	{"LAVASPLISH", 0, SPR_LSPL, FF_ANIMATE, 16, {NULL}, 7, 2, S_NULL, 0},
 
 	// Water Splash
-	{"S_SPLASH1", 0, SPR_SPLA, FF_TRANS50  , 3, {NULL}, 0, 0, S_SPLASH2, 0},
-	{"S_SPLASH2", 0, SPR_SPLA, FF_TRANS70|1, 3, {NULL}, 0, 0, S_SPLASH3, 0},
-	{"S_SPLASH3", 0, SPR_SPLA, FF_TRANS90|2, 3, {NULL}, 0, 0, S_RAINRETURN, 0},
+	{"SPLASH1", 0, SPR_SPLA, FF_TRANS50  , 3, {NULL}, 0, 0, S_SPLASH2, 0},
+	{"SPLASH2", 0, SPR_SPLA, FF_TRANS70|1, 3, {NULL}, 0, 0, S_SPLASH3, 0},
+	{"SPLASH3", 0, SPR_SPLA, FF_TRANS90|2, 3, {NULL}, 0, 0, S_RAINRETURN, 0},
 
 	// Smoke
-	{"S_SMOKE1", 0, SPR_SMOK, FF_TRANS50  , 4, {NULL}, 0, 0, S_SMOKE2, 0},
-	{"S_SMOKE2", 0, SPR_SMOK, FF_TRANS50|1, 5, {NULL}, 0, 0, S_SMOKE3, 0},
-	{"S_SMOKE3", 0, SPR_SMOK, FF_TRANS50|2, 6, {NULL}, 0, 0, S_SMOKE4, 0},
-	{"S_SMOKE4", 0, SPR_SMOK, FF_TRANS50|3, 7, {NULL}, 0, 0, S_SMOKE5, 0},
-	{"S_SMOKE5", 0, SPR_SMOK, FF_TRANS50|4, 8, {NULL}, 0, 0, S_NULL, 0},
+	{"SMOKE1", 0, SPR_SMOK, FF_TRANS50  , 4, {NULL}, 0, 0, S_SMOKE2, 0},
+	{"SMOKE2", 0, SPR_SMOK, FF_TRANS50|1, 5, {NULL}, 0, 0, S_SMOKE3, 0},
+	{"SMOKE3", 0, SPR_SMOK, FF_TRANS50|2, 6, {NULL}, 0, 0, S_SMOKE4, 0},
+	{"SMOKE4", 0, SPR_SMOK, FF_TRANS50|3, 7, {NULL}, 0, 0, S_SMOKE5, 0},
+	{"SMOKE5", 0, SPR_SMOK, FF_TRANS50|4, 8, {NULL}, 0, 0, S_NULL, 0},
 
 	// Bubbles
-	{"S_SMALLBUBBLE", 0, SPR_BUBL, FF_TRANS50,   1, {A_BubbleRise}, 0, 1024, S_SMALLBUBBLE, 0},
-	{"S_MEDIUMBUBBLE", 0, SPR_BUBL, FF_TRANS50|1, 1, {A_BubbleRise}, 0, 1024, S_MEDIUMBUBBLE, 0},
+	{"SMALLBUBBLE", 0, SPR_BUBL, FF_TRANS50,   1, {A_BubbleRise}, 0, 1024, S_SMALLBUBBLE, 0},
+	{"MEDIUMBUBBLE", 0, SPR_BUBL, FF_TRANS50|1, 1, {A_BubbleRise}, 0, 1024, S_MEDIUMBUBBLE, 0},
 
 	// Extra Large Bubble (breathable)
-	{"S_LARGEBUBBLE1", 0, SPR_BUBL, FF_TRANS50|FF_FULLBRIGHT|2,   8, {A_BubbleRise}, 0, 1024, S_LARGEBUBBLE2, 0},
-	{"S_LARGEBUBBLE2", 0, SPR_BUBL, FF_TRANS50|FF_FULLBRIGHT|3,   8, {A_BubbleRise}, 0, 1024, S_EXTRALARGEBUBBLE, 0},
-	{"S_EXTRALARGEBUBBLE", 0, SPR_BUBL, FF_TRANS50|FF_FULLBRIGHT|4,  16, {A_BubbleRise}, 0, 1024, S_EXTRALARGEBUBBLE, 0},
+	{"LARGEBUBBLE1", 0, SPR_BUBL, FF_TRANS50|FF_FULLBRIGHT|2,   8, {A_BubbleRise}, 0, 1024, S_LARGEBUBBLE2, 0},
+	{"LARGEBUBBLE2", 0, SPR_BUBL, FF_TRANS50|FF_FULLBRIGHT|3,   8, {A_BubbleRise}, 0, 1024, S_EXTRALARGEBUBBLE, 0},
+	{"EXTRALARGEBUBBLE", 0, SPR_BUBL, FF_TRANS50|FF_FULLBRIGHT|4,  16, {A_BubbleRise}, 0, 1024, S_EXTRALARGEBUBBLE, 0},
 
 	// Extra Large Bubble goes POP!
-	{"S_POP1", 0, SPR_BUBL, 5, 16, {NULL}, 0, 0, S_NULL, 0},
+	{"POP1", 0, SPR_BUBL, 5, 16, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_WATERZAP", 0, SPR_WZAP, FF_TRANS10|FF_ANIMATE|FF_RANDOMANIM, 4, {NULL}, 3, 2, S_NULL, 0},
+	{"WATERZAP", 0, SPR_WZAP, FF_TRANS10|FF_ANIMATE|FF_RANDOMANIM, 4, {NULL}, 3, 2, S_NULL, 0},
 
 	// Spindash dust
-	{"S_SPINDUST1", 0, SPR_DUST,                          0, 7, {NULL}, 0, 0, S_SPINDUST2, 0},
-	{"S_SPINDUST2", 0, SPR_DUST,                          1, 6, {NULL}, 0, 0, S_SPINDUST3, 0},
-	{"S_SPINDUST3", 0, SPR_DUST,               FF_TRANS30|2, 4, {NULL}, 0, 0, S_SPINDUST4, 0},
-	{"S_SPINDUST4", 0, SPR_DUST,               FF_TRANS60|3, 3, {NULL}, 0, 0, S_NULL, 0},
-	{"S_SPINDUST_BUBBLE1", 0, SPR_BUBL,                          0, 7, {NULL}, 0, 0, S_SPINDUST_BUBBLE2, 0},
-	{"S_SPINDUST_BUBBLE2", 0, SPR_BUBL,                          0, 6, {NULL}, 0, 0, S_SPINDUST_BUBBLE3, 0},
-	{"S_SPINDUST_BUBBLE3", 0, SPR_BUBL,               FF_TRANS30|0, 4, {NULL}, 0, 0, S_SPINDUST_BUBBLE4, 0},
-	{"S_SPINDUST_BUBBLE4", 0, SPR_BUBL,               FF_TRANS60|0, 3, {NULL}, 0, 0, S_NULL, 0},
-	{"S_SPINDUST_FIRE1", 0, SPR_FPRT,            FF_FULLBRIGHT|0, 7, {NULL}, 0, 0, S_SPINDUST_FIRE2, 0},
-	{"S_SPINDUST_FIRE2", 0, SPR_FPRT,            FF_FULLBRIGHT|0, 6, {NULL}, 0, 0, S_SPINDUST_FIRE3, 0},
-	{"S_SPINDUST_FIRE3", 0, SPR_FPRT, FF_FULLBRIGHT|FF_TRANS30|0, 4, {NULL}, 0, 0, S_SPINDUST_FIRE4, 0},
-	{"S_SPINDUST_FIRE4", 0, SPR_FPRT, FF_FULLBRIGHT|FF_TRANS60|0, 3, {NULL}, 0, 0, S_NULL, 0},
-
-
-	{"S_FOG1", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50,    2, {NULL}, 0, 0, S_FOG2, 0},
-	{"S_FOG2", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|1,  2, {NULL}, 0, 0, S_FOG3, 0},
-	{"S_FOG3", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|2,  2, {NULL}, 0, 0, S_FOG4, 0},
-	{"S_FOG4", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|3,  2, {NULL}, 0, 0, S_FOG5, 0},
-	{"S_FOG5", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|4,  2, {NULL}, 0, 0, S_FOG6, 0},
-	{"S_FOG6", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|5,  2, {NULL}, 0, 0, S_FOG7, 0},
-	{"S_FOG7", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|6,  2, {NULL}, 0, 0, S_FOG8, 0},
-	{"S_FOG8", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|7,  2, {NULL}, 0, 0, S_FOG9, 0},
-	{"S_FOG9", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|8,  2, {NULL}, 0, 0, S_FOG10, 0},
-	{"S_FOG10", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|9,  2, {NULL}, 0, 0, S_FOG11, 0},
-	{"S_FOG11", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|10, 2, {NULL}, 0, 0, S_FOG12, 0},
-	{"S_FOG12", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|11, 2, {NULL}, 0, 0, S_FOG13, 0},
-	{"S_FOG13", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|12, 2, {NULL}, 0, 0, S_FOG14, 0},
-	{"S_FOG14", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|13, 2, {NULL}, 0, 0, S_NULL, 0},
+	{"SPINDUST1", 0, SPR_DUST,                          0, 7, {NULL}, 0, 0, S_SPINDUST2, 0},
+	{"SPINDUST2", 0, SPR_DUST,                          1, 6, {NULL}, 0, 0, S_SPINDUST3, 0},
+	{"SPINDUST3", 0, SPR_DUST,               FF_TRANS30|2, 4, {NULL}, 0, 0, S_SPINDUST4, 0},
+	{"SPINDUST4", 0, SPR_DUST,               FF_TRANS60|3, 3, {NULL}, 0, 0, S_NULL, 0},
+	{"SPINDUST_BUBBLE1", 0, SPR_BUBL,                          0, 7, {NULL}, 0, 0, S_SPINDUST_BUBBLE2, 0},
+	{"SPINDUST_BUBBLE2", 0, SPR_BUBL,                          0, 6, {NULL}, 0, 0, S_SPINDUST_BUBBLE3, 0},
+	{"SPINDUST_BUBBLE3", 0, SPR_BUBL,               FF_TRANS30|0, 4, {NULL}, 0, 0, S_SPINDUST_BUBBLE4, 0},
+	{"SPINDUST_BUBBLE4", 0, SPR_BUBL,               FF_TRANS60|0, 3, {NULL}, 0, 0, S_NULL, 0},
+	{"SPINDUST_FIRE1", 0, SPR_FPRT,            FF_FULLBRIGHT|0, 7, {NULL}, 0, 0, S_SPINDUST_FIRE2, 0},
+	{"SPINDUST_FIRE2", 0, SPR_FPRT,            FF_FULLBRIGHT|0, 6, {NULL}, 0, 0, S_SPINDUST_FIRE3, 0},
+	{"SPINDUST_FIRE3", 0, SPR_FPRT, FF_FULLBRIGHT|FF_TRANS30|0, 4, {NULL}, 0, 0, S_SPINDUST_FIRE4, 0},
+	{"SPINDUST_FIRE4", 0, SPR_FPRT, FF_FULLBRIGHT|FF_TRANS60|0, 3, {NULL}, 0, 0, S_NULL, 0},
+
+
+	{"FOG1", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50,    2, {NULL}, 0, 0, S_FOG2, 0},
+	{"FOG2", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|1,  2, {NULL}, 0, 0, S_FOG3, 0},
+	{"FOG3", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|2,  2, {NULL}, 0, 0, S_FOG4, 0},
+	{"FOG4", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|3,  2, {NULL}, 0, 0, S_FOG5, 0},
+	{"FOG5", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|4,  2, {NULL}, 0, 0, S_FOG6, 0},
+	{"FOG6", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|5,  2, {NULL}, 0, 0, S_FOG7, 0},
+	{"FOG7", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|6,  2, {NULL}, 0, 0, S_FOG8, 0},
+	{"FOG8", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|7,  2, {NULL}, 0, 0, S_FOG9, 0},
+	{"FOG9", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|8,  2, {NULL}, 0, 0, S_FOG10, 0},
+	{"FOG10", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|9,  2, {NULL}, 0, 0, S_FOG11, 0},
+	{"FOG11", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|10, 2, {NULL}, 0, 0, S_FOG12, 0},
+	{"FOG12", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|11, 2, {NULL}, 0, 0, S_FOG13, 0},
+	{"FOG13", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|12, 2, {NULL}, 0, 0, S_FOG14, 0},
+	{"FOG14", 0, SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|13, 2, {NULL}, 0, 0, S_NULL, 0},
 
 	// Flower Seed
-	{"S_SEED", 0, SPR_SEED, FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 2, 2, S_NULL, 0},
+	{"SEED", 0, SPR_SEED, FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 2, 2, S_NULL, 0},
 
 	// Particle sprite
-	{"S_PARTICLE", 0, SPR_PRTL, 0, 2*TICRATE, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_SCRA", 0, SPR_SCOR, 0, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 100
-	{"S_SCRB", 0, SPR_SCOR, 1, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 200
-	{"S_SCRC", 0, SPR_SCOR, 2, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 500
-	{"S_SCRD", 0, SPR_SCOR, 3, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 1000
-	{"S_SCRE", 0, SPR_SCOR, 4, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 10000
-	{"S_SCRF", 0, SPR_SCOR, 5, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 400 (mario mode)
-	{"S_SCRG", 0, SPR_SCOR, 6, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 800 (mario mode)
-	{"S_SCRH", 0, SPR_SCOR, 7, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 2000 (mario mode)
-	{"S_SCRI", 0, SPR_SCOR, 8, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 4000 (mario mode)
-	{"S_SCRJ", 0, SPR_SCOR, 9, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 8000 (mario mode)
-	{"S_SCRK", 0, SPR_SCOR, 10, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},  // - 1UP (mario mode)
-	{"S_SCRL", 0, SPR_SCOR, 11, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},  // - 10
+	{"PARTICLE", 0, SPR_PRTL, 0, 2*TICRATE, {NULL}, 0, 0, S_NULL, 0},
+
+	{"SCRA", 0, SPR_SCOR, 0, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 100
+	{"SCRB", 0, SPR_SCOR, 1, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 200
+	{"SCRC", 0, SPR_SCOR, 2, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 500
+	{"SCRD", 0, SPR_SCOR, 3, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 1000
+	{"SCRE", 0, SPR_SCOR, 4, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 10000
+	{"SCRF", 0, SPR_SCOR, 5, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 400 (mario mode)
+	{"SCRG", 0, SPR_SCOR, 6, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 800 (mario mode)
+	{"SCRH", 0, SPR_SCOR, 7, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 2000 (mario mode)
+	{"SCRI", 0, SPR_SCOR, 8, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 4000 (mario mode)
+	{"SCRJ", 0, SPR_SCOR, 9, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},   // - 8000 (mario mode)
+	{"SCRK", 0, SPR_SCOR, 10, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},  // - 1UP (mario mode)
+	{"SCRL", 0, SPR_SCOR, 11, 32, {A_ScoreRise}, 0, 0, S_NULL, 0},  // - 10
 
 	// Drowning Timer Numbers
-	{"S_ZERO1", 0, SPR_DRWN, 0, 40, {NULL}, 0, 0, S_NULL, 0},
-	{"S_ONE1", 0, SPR_DRWN, 1, 40, {NULL}, 0, 0, S_NULL, 0},
-	{"S_TWO1", 0, SPR_DRWN, 2, 40, {NULL}, 0, 0, S_NULL, 0},
-	{"S_THREE1", 0, SPR_DRWN, 3, 40, {NULL}, 0, 0, S_NULL, 0},
-	{"S_FOUR1", 0, SPR_DRWN, 4, 40, {NULL}, 0, 0, S_NULL, 0},
-	{"S_FIVE1", 0, SPR_DRWN, 5, 40, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_ZERO2", 0, SPR_DRWN,  6, 40, {NULL}, 0, 0, S_NULL, 0},
-	{"S_ONE2", 0, SPR_DRWN,  7, 40, {NULL}, 0, 0, S_NULL, 0},
-	{"S_TWO2", 0, SPR_DRWN,  8, 40, {NULL}, 0, 0, S_NULL, 0},
-	{"S_THREE2", 0, SPR_DRWN,  9, 40, {NULL}, 0, 0, S_NULL, 0},
-	{"S_FOUR2", 0, SPR_DRWN, 10, 40, {NULL}, 0, 0, S_NULL, 0},
-	{"S_FIVE2", 0, SPR_DRWN, 11, 40, {NULL}, 0, 0, S_NULL, 0},
+	{"ZERO1", 0, SPR_DRWN, 0, 40, {NULL}, 0, 0, S_NULL, 0},
+	{"ONE1", 0, SPR_DRWN, 1, 40, {NULL}, 0, 0, S_NULL, 0},
+	{"TWO1", 0, SPR_DRWN, 2, 40, {NULL}, 0, 0, S_NULL, 0},
+	{"THREE1", 0, SPR_DRWN, 3, 40, {NULL}, 0, 0, S_NULL, 0},
+	{"FOUR1", 0, SPR_DRWN, 4, 40, {NULL}, 0, 0, S_NULL, 0},
+	{"FIVE1", 0, SPR_DRWN, 5, 40, {NULL}, 0, 0, S_NULL, 0},
+
+	{"ZERO2", 0, SPR_DRWN,  6, 40, {NULL}, 0, 0, S_NULL, 0},
+	{"ONE2", 0, SPR_DRWN,  7, 40, {NULL}, 0, 0, S_NULL, 0},
+	{"TWO2", 0, SPR_DRWN,  8, 40, {NULL}, 0, 0, S_NULL, 0},
+	{"THREE2", 0, SPR_DRWN,  9, 40, {NULL}, 0, 0, S_NULL, 0},
+	{"FOUR2", 0, SPR_DRWN, 10, 40, {NULL}, 0, 0, S_NULL, 0},
+	{"FIVE2", 0, SPR_DRWN, 11, 40, {NULL}, 0, 0, S_NULL, 0},
 
 	// Flight indicator
-	{"S_FLIGHTINDICATOR", 0, SPR_FLII, FF_FULLBRIGHT|FF_ANIMATE|0, -1, {NULL}, 4, 4, S_NULL, 0},
+	{"FLIGHTINDICATOR", 0, SPR_FLII, FF_FULLBRIGHT|FF_ANIMATE|0, -1, {NULL}, 4, 4, S_NULL, 0},
 
-	{"S_LOCKON1", 0, SPR_LCKN,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
-	{"S_LOCKON2", 0, SPR_LCKN, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
-	{"S_LOCKON3", 0, SPR_LCKN, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
-	{"S_LOCKON4", 0, SPR_LCKN, 3|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
+	{"LOCKON1", 0, SPR_LCKN,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
+	{"LOCKON2", 0, SPR_LCKN, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
+	{"LOCKON3", 0, SPR_LCKN, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
+	{"LOCKON4", 0, SPR_LCKN, 3|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_LOCKONINF1", 0, SPR_LCKN,   FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_LOCKONINF2", 0, SPR_LCKN, 1|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_LOCKONINF3", 0, SPR_LCKN, 2|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_LOCKONINF4", 0, SPR_LCKN, 3|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"LOCKONINF1", 0, SPR_LCKN,   FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"LOCKONINF2", 0, SPR_LCKN, 1|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"LOCKONINF3", 0, SPR_LCKN, 2|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"LOCKONINF4", 0, SPR_LCKN, 3|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_TTAG", 0, SPR_TTAG, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_NULL, 0},
+	{"TTAG", 0, SPR_TTAG, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_NULL, 0},
 
 	// CTF Sign
-	{"S_GOTFLAG", 0, SPR_GFLG, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_NULL, 0},
+	{"GOTFLAG", 0, SPR_GFLG, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Finish flag
-	{"S_FINISHFLAG", 0, SPR_FNSF,    FF_TRANS30, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"FINISHFLAG", 0, SPR_FNSF,    FF_TRANS30, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_CORK", 0, SPR_CORK,             0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_LHRT", 0, SPR_LHRT, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"CORK", 0, SPR_CORK,             0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"LHRT", 0, SPR_LHRT, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Red Rings (thrown)
-	{"S_RRNG1", 0, SPR_RRNG, FF_FULLBRIGHT,   1, {A_ThrownRing}, 0, 0, S_RRNG2, 0},
-	{"S_RRNG2", 0, SPR_RRNG, FF_FULLBRIGHT|1, 1, {A_ThrownRing}, 0, 0, S_RRNG3, 0},
-	{"S_RRNG3", 0, SPR_RRNG, FF_FULLBRIGHT|2, 1, {A_ThrownRing}, 0, 0, S_RRNG4, 0},
-	{"S_RRNG4", 0, SPR_RRNG, FF_FULLBRIGHT|3, 1, {A_ThrownRing}, 0, 0, S_RRNG5, 0},
-	{"S_RRNG5", 0, SPR_RRNG, FF_FULLBRIGHT|4, 1, {A_ThrownRing}, 0, 0, S_RRNG6, 0},
-	{"S_RRNG6", 0, SPR_RRNG, FF_FULLBRIGHT|5, 1, {A_ThrownRing}, 0, 0, S_RRNG7, 0},
-	{"S_RRNG7", 0, SPR_RRNG, FF_FULLBRIGHT|6, 1, {A_ThrownRing}, 0, 0, S_RRNG1, 0},
+	{"RRNG1", 0, SPR_RRNG, FF_FULLBRIGHT,   1, {A_ThrownRing}, 0, 0, S_RRNG2, 0},
+	{"RRNG2", 0, SPR_RRNG, FF_FULLBRIGHT|1, 1, {A_ThrownRing}, 0, 0, S_RRNG3, 0},
+	{"RRNG3", 0, SPR_RRNG, FF_FULLBRIGHT|2, 1, {A_ThrownRing}, 0, 0, S_RRNG4, 0},
+	{"RRNG4", 0, SPR_RRNG, FF_FULLBRIGHT|3, 1, {A_ThrownRing}, 0, 0, S_RRNG5, 0},
+	{"RRNG5", 0, SPR_RRNG, FF_FULLBRIGHT|4, 1, {A_ThrownRing}, 0, 0, S_RRNG6, 0},
+	{"RRNG6", 0, SPR_RRNG, FF_FULLBRIGHT|5, 1, {A_ThrownRing}, 0, 0, S_RRNG7, 0},
+	{"RRNG7", 0, SPR_RRNG, FF_FULLBRIGHT|6, 1, {A_ThrownRing}, 0, 0, S_RRNG1, 0},
 
 	// Weapon Ring Ammo
-	{"S_BOUNCERINGAMMO", 0, SPR_RNGB, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_BOUNCERINGAMMO, 0},
-	{"S_RAILRINGAMMO", 0, SPR_RNGR, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_RAILRINGAMMO, 0},
-	{"S_INFINITYRINGAMMO", 0, SPR_RNGI, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_INFINITYRINGAMMO, 0},
-	{"S_AUTOMATICRINGAMMO", 0, SPR_RNGA, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_AUTOMATICRINGAMMO, 0},
-	{"S_EXPLOSIONRINGAMMO", 0, SPR_RNGE, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_EXPLOSIONRINGAMMO, 0},
-	{"S_SCATTERRINGAMMO", 0, SPR_RNGS, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_SCATTERRINGAMMO, 0},
-	{"S_GRENADERINGAMMO", 0, SPR_RNGG, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_GRENADERINGAMMO, 0},
+	{"BOUNCERINGAMMO", 0, SPR_RNGB, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_BOUNCERINGAMMO, 0},
+	{"RAILRINGAMMO", 0, SPR_RNGR, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_RAILRINGAMMO, 0},
+	{"INFINITYRINGAMMO", 0, SPR_RNGI, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_INFINITYRINGAMMO, 0},
+	{"AUTOMATICRINGAMMO", 0, SPR_RNGA, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_AUTOMATICRINGAMMO, 0},
+	{"EXPLOSIONRINGAMMO", 0, SPR_RNGE, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_EXPLOSIONRINGAMMO, 0},
+	{"SCATTERRINGAMMO", 0, SPR_RNGS, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_SCATTERRINGAMMO, 0},
+	{"GRENADERINGAMMO", 0, SPR_RNGG, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 34, 1, S_GRENADERINGAMMO, 0},
 
 	// Bounce Ring Pickup
-	{"S_BOUNCEPICKUP", 0, SPR_PIKB, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 15, 1, S_BOUNCEPICKUP, 0},
+	{"BOUNCEPICKUP", 0, SPR_PIKB, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 15, 1, S_BOUNCEPICKUP, 0},
 
-	{"S_BOUNCEPICKUPFADE1", 0, SPR_PIKB,  0, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE2, 0},
-	{"S_BOUNCEPICKUPFADE2", 0, SPR_PIKB,  2, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE3, 0},
-	{"S_BOUNCEPICKUPFADE3", 0, SPR_PIKB,  4, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE4, 0},
-	{"S_BOUNCEPICKUPFADE4", 0, SPR_PIKB,  6, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE5, 0},
-	{"S_BOUNCEPICKUPFADE5", 0, SPR_PIKB,  8, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE6, 0},
-	{"S_BOUNCEPICKUPFADE6", 0, SPR_PIKB, 10, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE7, 0},
-	{"S_BOUNCEPICKUPFADE7", 0, SPR_PIKB, 12, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE8, 0},
-	{"S_BOUNCEPICKUPFADE8", 0, SPR_PIKB, 14, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE1, 0},
+	{"BOUNCEPICKUPFADE1", 0, SPR_PIKB,  0, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE2, 0},
+	{"BOUNCEPICKUPFADE2", 0, SPR_PIKB,  2, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE3, 0},
+	{"BOUNCEPICKUPFADE3", 0, SPR_PIKB,  4, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE4, 0},
+	{"BOUNCEPICKUPFADE4", 0, SPR_PIKB,  6, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE5, 0},
+	{"BOUNCEPICKUPFADE5", 0, SPR_PIKB,  8, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE6, 0},
+	{"BOUNCEPICKUPFADE6", 0, SPR_PIKB, 10, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE7, 0},
+	{"BOUNCEPICKUPFADE7", 0, SPR_PIKB, 12, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE8, 0},
+	{"BOUNCEPICKUPFADE8", 0, SPR_PIKB, 14, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE1, 0},
 
 	// Rail Ring Pickup
-	{"S_RAILPICKUP", 0, SPR_PIKR, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 15, 1, S_RAILPICKUP, 0},
+	{"RAILPICKUP", 0, SPR_PIKR, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 15, 1, S_RAILPICKUP, 0},
 
-	{"S_RAILPICKUPFADE1", 0, SPR_PIKR,  0, 1, {NULL}, 0, 0, S_RAILPICKUPFADE2, 0},
-	{"S_RAILPICKUPFADE2", 0, SPR_PIKR,  2, 1, {NULL}, 0, 0, S_RAILPICKUPFADE3, 0},
-	{"S_RAILPICKUPFADE3", 0, SPR_PIKR,  4, 1, {NULL}, 0, 0, S_RAILPICKUPFADE4, 0},
-	{"S_RAILPICKUPFADE4", 0, SPR_PIKR,  6, 1, {NULL}, 0, 0, S_RAILPICKUPFADE5, 0},
-	{"S_RAILPICKUPFADE5", 0, SPR_PIKR,  8, 1, {NULL}, 0, 0, S_RAILPICKUPFADE6, 0},
-	{"S_RAILPICKUPFADE6", 0, SPR_PIKR, 10, 1, {NULL}, 0, 0, S_RAILPICKUPFADE7, 0},
-	{"S_RAILPICKUPFADE7", 0, SPR_PIKR, 12, 1, {NULL}, 0, 0, S_RAILPICKUPFADE8, 0},
-	{"S_RAILPICKUPFADE8", 0, SPR_PIKR, 14, 1, {NULL}, 0, 0, S_RAILPICKUPFADE1, 0},
+	{"RAILPICKUPFADE1", 0, SPR_PIKR,  0, 1, {NULL}, 0, 0, S_RAILPICKUPFADE2, 0},
+	{"RAILPICKUPFADE2", 0, SPR_PIKR,  2, 1, {NULL}, 0, 0, S_RAILPICKUPFADE3, 0},
+	{"RAILPICKUPFADE3", 0, SPR_PIKR,  4, 1, {NULL}, 0, 0, S_RAILPICKUPFADE4, 0},
+	{"RAILPICKUPFADE4", 0, SPR_PIKR,  6, 1, {NULL}, 0, 0, S_RAILPICKUPFADE5, 0},
+	{"RAILPICKUPFADE5", 0, SPR_PIKR,  8, 1, {NULL}, 0, 0, S_RAILPICKUPFADE6, 0},
+	{"RAILPICKUPFADE6", 0, SPR_PIKR, 10, 1, {NULL}, 0, 0, S_RAILPICKUPFADE7, 0},
+	{"RAILPICKUPFADE7", 0, SPR_PIKR, 12, 1, {NULL}, 0, 0, S_RAILPICKUPFADE8, 0},
+	{"RAILPICKUPFADE8", 0, SPR_PIKR, 14, 1, {NULL}, 0, 0, S_RAILPICKUPFADE1, 0},
 
 	// Auto Ring Pickup
-	{"S_AUTOPICKUP", 0, SPR_PIKA, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 15, 1, S_AUTOPICKUP, 0},
+	{"AUTOPICKUP", 0, SPR_PIKA, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 15, 1, S_AUTOPICKUP, 0},
 
-	{"S_AUTOPICKUPFADE1", 0, SPR_PIKA,  0, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE2, 0},
-	{"S_AUTOPICKUPFADE2", 0, SPR_PIKA,  2, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE3, 0},
-	{"S_AUTOPICKUPFADE3", 0, SPR_PIKA,  4, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE4, 0},
-	{"S_AUTOPICKUPFADE4", 0, SPR_PIKA,  6, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE5, 0},
-	{"S_AUTOPICKUPFADE5", 0, SPR_PIKA,  8, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE6, 0},
-	{"S_AUTOPICKUPFADE6", 0, SPR_PIKA, 10, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE7, 0},
-	{"S_AUTOPICKUPFADE7", 0, SPR_PIKA, 12, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE8, 0},
-	{"S_AUTOPICKUPFADE8", 0, SPR_PIKA, 14, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE1, 0},
+	{"AUTOPICKUPFADE1", 0, SPR_PIKA,  0, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE2, 0},
+	{"AUTOPICKUPFADE2", 0, SPR_PIKA,  2, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE3, 0},
+	{"AUTOPICKUPFADE3", 0, SPR_PIKA,  4, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE4, 0},
+	{"AUTOPICKUPFADE4", 0, SPR_PIKA,  6, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE5, 0},
+	{"AUTOPICKUPFADE5", 0, SPR_PIKA,  8, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE6, 0},
+	{"AUTOPICKUPFADE6", 0, SPR_PIKA, 10, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE7, 0},
+	{"AUTOPICKUPFADE7", 0, SPR_PIKA, 12, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE8, 0},
+	{"AUTOPICKUPFADE8", 0, SPR_PIKA, 14, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE1, 0},
 
 	// Explode Ring Pickup
-	{"S_EXPLODEPICKUP", 0, SPR_PIKE, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 15, 1, S_EXPLODEPICKUP, 0},
+	{"EXPLODEPICKUP", 0, SPR_PIKE, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 15, 1, S_EXPLODEPICKUP, 0},
 
-	{"S_EXPLODEPICKUPFADE1", 0, SPR_PIKE,  0, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE2, 0},
-	{"S_EXPLODEPICKUPFADE2", 0, SPR_PIKE,  2, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE3, 0},
-	{"S_EXPLODEPICKUPFADE3", 0, SPR_PIKE,  4, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE4, 0},
-	{"S_EXPLODEPICKUPFADE4", 0, SPR_PIKE,  6, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE5, 0},
-	{"S_EXPLODEPICKUPFADE5", 0, SPR_PIKE,  8, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE6, 0},
-	{"S_EXPLODEPICKUPFADE6", 0, SPR_PIKE, 10, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE7, 0},
-	{"S_EXPLODEPICKUPFADE7", 0, SPR_PIKE, 12, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE8, 0},
-	{"S_EXPLODEPICKUPFADE8", 0, SPR_PIKE, 14, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE1, 0},
+	{"EXPLODEPICKUPFADE1", 0, SPR_PIKE,  0, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE2, 0},
+	{"EXPLODEPICKUPFADE2", 0, SPR_PIKE,  2, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE3, 0},
+	{"EXPLODEPICKUPFADE3", 0, SPR_PIKE,  4, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE4, 0},
+	{"EXPLODEPICKUPFADE4", 0, SPR_PIKE,  6, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE5, 0},
+	{"EXPLODEPICKUPFADE5", 0, SPR_PIKE,  8, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE6, 0},
+	{"EXPLODEPICKUPFADE6", 0, SPR_PIKE, 10, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE7, 0},
+	{"EXPLODEPICKUPFADE7", 0, SPR_PIKE, 12, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE8, 0},
+	{"EXPLODEPICKUPFADE8", 0, SPR_PIKE, 14, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE1, 0},
 
 	// Scatter Ring Pickup
-	{"S_SCATTERPICKUP", 0, SPR_PIKS,  FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 15, 1, S_SCATTERPICKUP, 0},
+	{"SCATTERPICKUP", 0, SPR_PIKS,  FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 15, 1, S_SCATTERPICKUP, 0},
 
-	{"S_SCATTERPICKUPFADE1", 0, SPR_PIKS,  0, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE2, 0},
-	{"S_SCATTERPICKUPFADE2", 0, SPR_PIKS,  2, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE3, 0},
-	{"S_SCATTERPICKUPFADE3", 0, SPR_PIKS,  4, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE4, 0},
-	{"S_SCATTERPICKUPFADE4", 0, SPR_PIKS,  6, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE5, 0},
-	{"S_SCATTERPICKUPFADE5", 0, SPR_PIKS,  8, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE6, 0},
-	{"S_SCATTERPICKUPFADE6", 0, SPR_PIKS, 10, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE7, 0},
-	{"S_SCATTERPICKUPFADE7", 0, SPR_PIKS, 12, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE8, 0},
-	{"S_SCATTERPICKUPFADE8", 0, SPR_PIKS, 14, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE1, 0},
+	{"SCATTERPICKUPFADE1", 0, SPR_PIKS,  0, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE2, 0},
+	{"SCATTERPICKUPFADE2", 0, SPR_PIKS,  2, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE3, 0},
+	{"SCATTERPICKUPFADE3", 0, SPR_PIKS,  4, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE4, 0},
+	{"SCATTERPICKUPFADE4", 0, SPR_PIKS,  6, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE5, 0},
+	{"SCATTERPICKUPFADE5", 0, SPR_PIKS,  8, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE6, 0},
+	{"SCATTERPICKUPFADE6", 0, SPR_PIKS, 10, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE7, 0},
+	{"SCATTERPICKUPFADE7", 0, SPR_PIKS, 12, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE8, 0},
+	{"SCATTERPICKUPFADE8", 0, SPR_PIKS, 14, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE1, 0},
 
 	// Grenade Ring Pickup
-	{"S_GRENADEPICKUP", 0, SPR_PIKG,  FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 15, 1, S_GRENADEPICKUP, 0},
+	{"GRENADEPICKUP", 0, SPR_PIKG,  FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 15, 1, S_GRENADEPICKUP, 0},
 
-	{"S_GRENADEPICKUPFADE1", 0, SPR_PIKG,  0, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE2, 0},
-	{"S_GRENADEPICKUPFADE2", 0, SPR_PIKG,  2, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE3, 0},
-	{"S_GRENADEPICKUPFADE3", 0, SPR_PIKG,  4, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE4, 0},
-	{"S_GRENADEPICKUPFADE4", 0, SPR_PIKG,  6, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE5, 0},
-	{"S_GRENADEPICKUPFADE5", 0, SPR_PIKG,  8, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE6, 0},
-	{"S_GRENADEPICKUPFADE6", 0, SPR_PIKG, 10, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE7, 0},
-	{"S_GRENADEPICKUPFADE7", 0, SPR_PIKG, 12, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE8, 0},
-	{"S_GRENADEPICKUPFADE8", 0, SPR_PIKG, 14, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE1, 0},
+	{"GRENADEPICKUPFADE1", 0, SPR_PIKG,  0, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE2, 0},
+	{"GRENADEPICKUPFADE2", 0, SPR_PIKG,  2, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE3, 0},
+	{"GRENADEPICKUPFADE3", 0, SPR_PIKG,  4, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE4, 0},
+	{"GRENADEPICKUPFADE4", 0, SPR_PIKG,  6, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE5, 0},
+	{"GRENADEPICKUPFADE5", 0, SPR_PIKG,  8, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE6, 0},
+	{"GRENADEPICKUPFADE6", 0, SPR_PIKG, 10, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE7, 0},
+	{"GRENADEPICKUPFADE7", 0, SPR_PIKG, 12, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE8, 0},
+	{"GRENADEPICKUPFADE8", 0, SPR_PIKG, 14, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE1, 0},
 
 	// Thrown Weapon Rings
-	{"S_THROWNBOUNCE1", 0, SPR_RNGB, FF_FULLBRIGHT   , 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE2, 0},
-	{"S_THROWNBOUNCE2", 0, SPR_RNGB, FF_FULLBRIGHT| 5, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE3, 0},
-	{"S_THROWNBOUNCE3", 0, SPR_RNGB, FF_FULLBRIGHT|10, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE4, 0},
-	{"S_THROWNBOUNCE4", 0, SPR_RNGB, FF_FULLBRIGHT|15, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE5, 0},
-	{"S_THROWNBOUNCE5", 0, SPR_RNGB, FF_FULLBRIGHT|20, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE6, 0},
-	{"S_THROWNBOUNCE6", 0, SPR_RNGB, FF_FULLBRIGHT|25, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE7, 0},
-	{"S_THROWNBOUNCE7", 0, SPR_RNGB, FF_FULLBRIGHT|30, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE1, 0},
-
-	{"S_THROWNINFINITY1", 0, SPR_RNGI, FF_FULLBRIGHT   , 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY2, 0},
-	{"S_THROWNINFINITY2", 0, SPR_RNGI, FF_FULLBRIGHT| 5, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY3, 0},
-	{"S_THROWNINFINITY3", 0, SPR_RNGI, FF_FULLBRIGHT|10, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY4, 0},
-	{"S_THROWNINFINITY4", 0, SPR_RNGI, FF_FULLBRIGHT|15, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY5, 0},
-	{"S_THROWNINFINITY5", 0, SPR_RNGI, FF_FULLBRIGHT|20, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY6, 0},
-	{"S_THROWNINFINITY6", 0, SPR_RNGI, FF_FULLBRIGHT|25, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY7, 0},
-	{"S_THROWNINFINITY7", 0, SPR_RNGI, FF_FULLBRIGHT|30, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY1, 0},
-
-	{"S_THROWNAUTOMATIC1", 0, SPR_TAUT, FF_FULLBRIGHT  , 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC2, 0},
-	{"S_THROWNAUTOMATIC2", 0, SPR_TAUT, FF_FULLBRIGHT|1, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC3, 0},
-	{"S_THROWNAUTOMATIC3", 0, SPR_TAUT, FF_FULLBRIGHT|2, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC4, 0},
-	{"S_THROWNAUTOMATIC4", 0, SPR_TAUT, FF_FULLBRIGHT|3, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC5, 0},
-	{"S_THROWNAUTOMATIC5", 0, SPR_TAUT, FF_FULLBRIGHT|4, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC6, 0},
-	{"S_THROWNAUTOMATIC6", 0, SPR_TAUT, FF_FULLBRIGHT|5, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC7, 0},
-	{"S_THROWNAUTOMATIC7", 0, SPR_TAUT, FF_FULLBRIGHT|6, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC1, 0},
-
-	{"S_THROWNEXPLOSION1", 0, SPR_RNGE, FF_FULLBRIGHT   , 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION2, 0},
-	{"S_THROWNEXPLOSION2", 0, SPR_RNGE, FF_FULLBRIGHT| 5, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION3, 0},
-	{"S_THROWNEXPLOSION3", 0, SPR_RNGE, FF_FULLBRIGHT|10, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION4, 0},
-	{"S_THROWNEXPLOSION4", 0, SPR_RNGE, FF_FULLBRIGHT|15, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION5, 0},
-	{"S_THROWNEXPLOSION5", 0, SPR_RNGE, FF_FULLBRIGHT|20, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION6, 0},
-	{"S_THROWNEXPLOSION6", 0, SPR_RNGE, FF_FULLBRIGHT|25, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION7, 0},
-	{"S_THROWNEXPLOSION7", 0, SPR_RNGE, FF_FULLBRIGHT|30, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION1, 0},
-
-	{"S_THROWNGRENADE1", 0, SPR_TGRE, FF_FULLBRIGHT   , 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE2, 0},
-	{"S_THROWNGRENADE2", 0, SPR_TGRE, FF_FULLBRIGHT| 1, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE3, 0},
-	{"S_THROWNGRENADE3", 0, SPR_TGRE, FF_FULLBRIGHT| 2, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE4, 0},
-	{"S_THROWNGRENADE4", 0, SPR_TGRE, FF_FULLBRIGHT| 3, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE5, 0},
-	{"S_THROWNGRENADE5", 0, SPR_TGRE, FF_FULLBRIGHT| 4, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE6, 0},
-	{"S_THROWNGRENADE6", 0, SPR_TGRE, FF_FULLBRIGHT| 5, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE7, 0},
-	{"S_THROWNGRENADE7", 0, SPR_TGRE, FF_FULLBRIGHT| 6, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE8, 0},
-	{"S_THROWNGRENADE8", 0, SPR_TGRE, FF_FULLBRIGHT| 7, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE9, 0},
-	{"S_THROWNGRENADE9", 0, SPR_TGRE, FF_FULLBRIGHT| 8, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE10, 0},
-	{"S_THROWNGRENADE10", 0, SPR_TGRE, FF_FULLBRIGHT| 9, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE11, 0},
-	{"S_THROWNGRENADE11", 0, SPR_TGRE, FF_FULLBRIGHT|10, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE12, 0},
-	{"S_THROWNGRENADE12", 0, SPR_TGRE, FF_FULLBRIGHT|11, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE13, 0},
-	{"S_THROWNGRENADE13", 0, SPR_TGRE, FF_FULLBRIGHT|12, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE14, 0},
-	{"S_THROWNGRENADE14", 0, SPR_TGRE, FF_FULLBRIGHT|13, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE15, 0},
-	{"S_THROWNGRENADE15", 0, SPR_TGRE, FF_FULLBRIGHT|14, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE16, 0},
-	{"S_THROWNGRENADE16", 0, SPR_TGRE, FF_FULLBRIGHT|15, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE17, 0},
-	{"S_THROWNGRENADE17", 0, SPR_TGRE, FF_FULLBRIGHT|16, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE18, 0},
-	{"S_THROWNGRENADE18", 0, SPR_TGRE, FF_FULLBRIGHT|17, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE1, 0},
-
-	{"S_THROWNSCATTER", 0, SPR_TSCR, FF_FULLBRIGHT, 1, {A_ThrownRing}, 0, 0, S_THROWNSCATTER, 0},
-
-	{"S_RINGEXPLODE", 0, SPR_NULL, 0, 1, {A_RingExplode}, 0, 0, S_XPLD1, 0},
+	{"THROWNBOUNCE1", 0, SPR_RNGB, FF_FULLBRIGHT   , 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE2, 0},
+	{"THROWNBOUNCE2", 0, SPR_RNGB, FF_FULLBRIGHT| 5, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE3, 0},
+	{"THROWNBOUNCE3", 0, SPR_RNGB, FF_FULLBRIGHT|10, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE4, 0},
+	{"THROWNBOUNCE4", 0, SPR_RNGB, FF_FULLBRIGHT|15, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE5, 0},
+	{"THROWNBOUNCE5", 0, SPR_RNGB, FF_FULLBRIGHT|20, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE6, 0},
+	{"THROWNBOUNCE6", 0, SPR_RNGB, FF_FULLBRIGHT|25, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE7, 0},
+	{"THROWNBOUNCE7", 0, SPR_RNGB, FF_FULLBRIGHT|30, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE1, 0},
+
+	{"THROWNINFINITY1", 0, SPR_RNGI, FF_FULLBRIGHT   , 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY2, 0},
+	{"THROWNINFINITY2", 0, SPR_RNGI, FF_FULLBRIGHT| 5, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY3, 0},
+	{"THROWNINFINITY3", 0, SPR_RNGI, FF_FULLBRIGHT|10, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY4, 0},
+	{"THROWNINFINITY4", 0, SPR_RNGI, FF_FULLBRIGHT|15, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY5, 0},
+	{"THROWNINFINITY5", 0, SPR_RNGI, FF_FULLBRIGHT|20, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY6, 0},
+	{"THROWNINFINITY6", 0, SPR_RNGI, FF_FULLBRIGHT|25, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY7, 0},
+	{"THROWNINFINITY7", 0, SPR_RNGI, FF_FULLBRIGHT|30, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY1, 0},
+
+	{"THROWNAUTOMATIC1", 0, SPR_TAUT, FF_FULLBRIGHT  , 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC2, 0},
+	{"THROWNAUTOMATIC2", 0, SPR_TAUT, FF_FULLBRIGHT|1, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC3, 0},
+	{"THROWNAUTOMATIC3", 0, SPR_TAUT, FF_FULLBRIGHT|2, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC4, 0},
+	{"THROWNAUTOMATIC4", 0, SPR_TAUT, FF_FULLBRIGHT|3, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC5, 0},
+	{"THROWNAUTOMATIC5", 0, SPR_TAUT, FF_FULLBRIGHT|4, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC6, 0},
+	{"THROWNAUTOMATIC6", 0, SPR_TAUT, FF_FULLBRIGHT|5, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC7, 0},
+	{"THROWNAUTOMATIC7", 0, SPR_TAUT, FF_FULLBRIGHT|6, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC1, 0},
+
+	{"THROWNEXPLOSION1", 0, SPR_RNGE, FF_FULLBRIGHT   , 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION2, 0},
+	{"THROWNEXPLOSION2", 0, SPR_RNGE, FF_FULLBRIGHT| 5, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION3, 0},
+	{"THROWNEXPLOSION3", 0, SPR_RNGE, FF_FULLBRIGHT|10, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION4, 0},
+	{"THROWNEXPLOSION4", 0, SPR_RNGE, FF_FULLBRIGHT|15, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION5, 0},
+	{"THROWNEXPLOSION5", 0, SPR_RNGE, FF_FULLBRIGHT|20, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION6, 0},
+	{"THROWNEXPLOSION6", 0, SPR_RNGE, FF_FULLBRIGHT|25, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION7, 0},
+	{"THROWNEXPLOSION7", 0, SPR_RNGE, FF_FULLBRIGHT|30, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION1, 0},
+
+	{"THROWNGRENADE1", 0, SPR_TGRE, FF_FULLBRIGHT   , 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE2, 0},
+	{"THROWNGRENADE2", 0, SPR_TGRE, FF_FULLBRIGHT| 1, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE3, 0},
+	{"THROWNGRENADE3", 0, SPR_TGRE, FF_FULLBRIGHT| 2, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE4, 0},
+	{"THROWNGRENADE4", 0, SPR_TGRE, FF_FULLBRIGHT| 3, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE5, 0},
+	{"THROWNGRENADE5", 0, SPR_TGRE, FF_FULLBRIGHT| 4, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE6, 0},
+	{"THROWNGRENADE6", 0, SPR_TGRE, FF_FULLBRIGHT| 5, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE7, 0},
+	{"THROWNGRENADE7", 0, SPR_TGRE, FF_FULLBRIGHT| 6, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE8, 0},
+	{"THROWNGRENADE8", 0, SPR_TGRE, FF_FULLBRIGHT| 7, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE9, 0},
+	{"THROWNGRENADE9", 0, SPR_TGRE, FF_FULLBRIGHT| 8, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE10, 0},
+	{"THROWNGRENADE10", 0, SPR_TGRE, FF_FULLBRIGHT| 9, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE11, 0},
+	{"THROWNGRENADE11", 0, SPR_TGRE, FF_FULLBRIGHT|10, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE12, 0},
+	{"THROWNGRENADE12", 0, SPR_TGRE, FF_FULLBRIGHT|11, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE13, 0},
+	{"THROWNGRENADE13", 0, SPR_TGRE, FF_FULLBRIGHT|12, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE14, 0},
+	{"THROWNGRENADE14", 0, SPR_TGRE, FF_FULLBRIGHT|13, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE15, 0},
+	{"THROWNGRENADE15", 0, SPR_TGRE, FF_FULLBRIGHT|14, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE16, 0},
+	{"THROWNGRENADE16", 0, SPR_TGRE, FF_FULLBRIGHT|15, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE17, 0},
+	{"THROWNGRENADE17", 0, SPR_TGRE, FF_FULLBRIGHT|16, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE18, 0},
+	{"THROWNGRENADE18", 0, SPR_TGRE, FF_FULLBRIGHT|17, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE1, 0},
+
+	{"THROWNSCATTER", 0, SPR_TSCR, FF_FULLBRIGHT, 1, {A_ThrownRing}, 0, 0, S_THROWNSCATTER, 0},
+
+	{"RINGEXPLODE", 0, SPR_NULL, 0, 1, {A_RingExplode}, 0, 0, S_XPLD1, 0},
 
 	// Coin
-	{"S_COIN1", 0, SPR_COIN, FF_FULLBRIGHT,   5, {NULL}, 0, 0, S_COIN2, 0},
-	{"S_COIN2", 0, SPR_COIN, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_COIN3, 0},
-	{"S_COIN3", 0, SPR_COIN, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_COIN1, 0},
+	{"COIN1", 0, SPR_COIN, FF_FULLBRIGHT,   5, {NULL}, 0, 0, S_COIN2, 0},
+	{"COIN2", 0, SPR_COIN, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_COIN3, 0},
+	{"COIN3", 0, SPR_COIN, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_COIN1, 0},
 
 	// Coin Sparkle
-	{"S_COINSPARKLE1", 0, SPR_CPRK, FF_FULLBRIGHT,   5, {NULL}, 0, 0, S_COINSPARKLE2, 0},
-	{"S_COINSPARKLE2", 0, SPR_CPRK, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_COINSPARKLE3, 0},
-	{"S_COINSPARKLE3", 0, SPR_CPRK, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_COINSPARKLE4, 0},
-	{"S_COINSPARKLE4", 0, SPR_CPRK, FF_FULLBRIGHT|3, 5, {NULL}, 0, 0, S_NULL, 0},
+	{"COINSPARKLE1", 0, SPR_CPRK, FF_FULLBRIGHT,   5, {NULL}, 0, 0, S_COINSPARKLE2, 0},
+	{"COINSPARKLE2", 0, SPR_CPRK, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_COINSPARKLE3, 0},
+	{"COINSPARKLE3", 0, SPR_CPRK, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_COINSPARKLE4, 0},
+	{"COINSPARKLE4", 0, SPR_CPRK, FF_FULLBRIGHT|3, 5, {NULL}, 0, 0, S_NULL, 0},
 
 	// Goomba
-	{"S_GOOMBA1", 0, SPR_GOOM, 0, 6, {A_Look}, 0, 0, S_GOOMBA1B, 0},
-	{"S_GOOMBA1B", 0, SPR_GOOM, 1, 6, {A_Look}, 0, 0, S_GOOMBA1, 0},
-	{"S_GOOMBA2", 0, SPR_GOOM, 0, 3, {A_Chase}, 0, 0, S_GOOMBA3, 0},
-	{"S_GOOMBA3", 0, SPR_GOOM, 0, 3, {A_Chase}, 0, 0, S_GOOMBA4, 0},
-	{"S_GOOMBA4", 0, SPR_GOOM, 1, 3, {A_Chase}, 0, 0, S_GOOMBA5, 0},
-	{"S_GOOMBA5", 0, SPR_GOOM, 1, 3, {A_Chase}, 0, 0, S_GOOMBA6, 0},
-	{"S_GOOMBA6", 0, SPR_GOOM, 0, 3, {A_Chase}, 0, 0, S_GOOMBA7, 0},
-	{"S_GOOMBA7", 0, SPR_GOOM, 0, 3, {A_Chase}, 0, 0, S_GOOMBA8, 0},
-	{"S_GOOMBA8", 0, SPR_GOOM, 1, 3, {A_Chase}, 0, 0, S_GOOMBA9, 0},
-	{"S_GOOMBA9", 0, SPR_GOOM, 1, 3, {A_Chase}, 0, 0, S_GOOMBA2, 0},
-	{"S_GOOMBA_DEAD", 0, SPR_GOOM, 2, 16, {A_Scream}, 0, 0, S_NULL, 0},
+	{"GOOMBA1", 0, SPR_GOOM, 0, 6, {A_Look}, 0, 0, S_GOOMBA1B, 0},
+	{"GOOMBA1B", 0, SPR_GOOM, 1, 6, {A_Look}, 0, 0, S_GOOMBA1, 0},
+	{"GOOMBA2", 0, SPR_GOOM, 0, 3, {A_Chase}, 0, 0, S_GOOMBA3, 0},
+	{"GOOMBA3", 0, SPR_GOOM, 0, 3, {A_Chase}, 0, 0, S_GOOMBA4, 0},
+	{"GOOMBA4", 0, SPR_GOOM, 1, 3, {A_Chase}, 0, 0, S_GOOMBA5, 0},
+	{"GOOMBA5", 0, SPR_GOOM, 1, 3, {A_Chase}, 0, 0, S_GOOMBA6, 0},
+	{"GOOMBA6", 0, SPR_GOOM, 0, 3, {A_Chase}, 0, 0, S_GOOMBA7, 0},
+	{"GOOMBA7", 0, SPR_GOOM, 0, 3, {A_Chase}, 0, 0, S_GOOMBA8, 0},
+	{"GOOMBA8", 0, SPR_GOOM, 1, 3, {A_Chase}, 0, 0, S_GOOMBA9, 0},
+	{"GOOMBA9", 0, SPR_GOOM, 1, 3, {A_Chase}, 0, 0, S_GOOMBA2, 0},
+	{"GOOMBA_DEAD", 0, SPR_GOOM, 2, 16, {A_Scream}, 0, 0, S_NULL, 0},
 
 	// Blue Goomba
-	{"S_BLUEGOOMBA1", 0, SPR_BGOM, 0, 6, {A_Look}, 0, 0, S_BLUEGOOMBA1B, 0},
-	{"S_BLUEGOOMBA1B", 0, SPR_BGOM, 1, 6, {A_Look}, 0, 0, S_BLUEGOOMBA1, 0},
-	{"S_BLUEGOOMBA2", 0, SPR_BGOM, 0, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA3, 0},
-	{"S_BLUEGOOMBA3", 0, SPR_BGOM, 0, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA4, 0},
-	{"S_BLUEGOOMBA4", 0, SPR_BGOM, 1, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA5, 0},
-	{"S_BLUEGOOMBA5", 0, SPR_BGOM, 1, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA6, 0},
-	{"S_BLUEGOOMBA6", 0, SPR_BGOM, 0, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA7, 0},
-	{"S_BLUEGOOMBA7", 0, SPR_BGOM, 0, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA8, 0},
-	{"S_BLUEGOOMBA8", 0, SPR_BGOM, 1, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA9, 0},
-	{"S_BLUEGOOMBA9", 0, SPR_BGOM, 1, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA2, 0},
-	{"S_BLUEGOOMBA_DEAD", 0, SPR_BGOM, 2, 16, {A_Scream}, 0, 0, S_NULL, 0},
+	{"BLUEGOOMBA1", 0, SPR_BGOM, 0, 6, {A_Look}, 0, 0, S_BLUEGOOMBA1B, 0},
+	{"BLUEGOOMBA1B", 0, SPR_BGOM, 1, 6, {A_Look}, 0, 0, S_BLUEGOOMBA1, 0},
+	{"BLUEGOOMBA2", 0, SPR_BGOM, 0, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA3, 0},
+	{"BLUEGOOMBA3", 0, SPR_BGOM, 0, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA4, 0},
+	{"BLUEGOOMBA4", 0, SPR_BGOM, 1, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA5, 0},
+	{"BLUEGOOMBA5", 0, SPR_BGOM, 1, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA6, 0},
+	{"BLUEGOOMBA6", 0, SPR_BGOM, 0, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA7, 0},
+	{"BLUEGOOMBA7", 0, SPR_BGOM, 0, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA8, 0},
+	{"BLUEGOOMBA8", 0, SPR_BGOM, 1, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA9, 0},
+	{"BLUEGOOMBA9", 0, SPR_BGOM, 1, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA2, 0},
+	{"BLUEGOOMBA_DEAD", 0, SPR_BGOM, 2, 16, {A_Scream}, 0, 0, S_NULL, 0},
 
 	// Fire Flower
-	{"S_FIREFLOWER1", 0, SPR_FFWR, 0, 3, {NULL}, 0, 0, S_FIREFLOWER2, 0},
-	{"S_FIREFLOWER2", 0, SPR_FFWR, 1, 3, {NULL}, 0, 0, S_FIREFLOWER3, 0},
-	{"S_FIREFLOWER3", 0, SPR_FFWR, 2, 3, {NULL}, 0, 0, S_FIREFLOWER4, 0},
-	{"S_FIREFLOWER4", 0, SPR_FFWR, 3, 3, {NULL}, 0, 0, S_FIREFLOWER1, 0},
+	{"FIREFLOWER1", 0, SPR_FFWR, 0, 3, {NULL}, 0, 0, S_FIREFLOWER2, 0},
+	{"FIREFLOWER2", 0, SPR_FFWR, 1, 3, {NULL}, 0, 0, S_FIREFLOWER3, 0},
+	{"FIREFLOWER3", 0, SPR_FFWR, 2, 3, {NULL}, 0, 0, S_FIREFLOWER4, 0},
+	{"FIREFLOWER4", 0, SPR_FFWR, 3, 3, {NULL}, 0, 0, S_FIREFLOWER1, 0},
 
 	// Thrown Mario Fireball
-	{"S_FIREBALL", 0, SPR_FBLL, FF_FULLBRIGHT,   1, {A_SpawnObjectRelative}, 0, MT_FIREBALLTRAIL, S_FIREBALL, 0},
-	{"S_FIREBALLTRAIL1", 0, SPR_FBLL, 1|FF_FULLBRIGHT|FF_TRANS50, 1, {A_SetScale}, FRACUNIT*3/4, 0, S_FIREBALLTRAIL2, 0},
-	{"S_FIREBALLTRAIL2", 0, SPR_FBLL, 1|FF_FULLBRIGHT|FF_TRANS50, 8, {A_SetScale}, FRACUNIT/6, 1, S_NULL, 0},
+	{"FIREBALL", 0, SPR_FBLL, FF_FULLBRIGHT,   1, {A_SpawnObjectRelative}, 0, MT_FIREBALLTRAIL, S_FIREBALL, 0},
+	{"FIREBALLTRAIL1", 0, SPR_FBLL, 1|FF_FULLBRIGHT|FF_TRANS50, 1, {A_SetScale}, FRACUNIT*3/4, 0, S_FIREBALLTRAIL2, 0},
+	{"FIREBALLTRAIL2", 0, SPR_FBLL, 1|FF_FULLBRIGHT|FF_TRANS50, 8, {A_SetScale}, FRACUNIT/6, 1, S_NULL, 0},
 
 	// Turtle Shell
-	{"S_SHELL", 0, SPR_SHLL, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"SHELL", 0, SPR_SHLL, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Puma (Mario fireball)
-	{"S_PUMA_START1", 0, SPR_PUMA, FF_FULLBRIGHT|2, 1, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_START2, 0},
-	{"S_PUMA_START2", 0, SPR_PUMA, FF_FULLBRIGHT|2, 1, {A_PlaySound}, sfx_s3k70, 1 + (1<<16), S_PUMA_UP1, 0},
-	{"S_PUMA_UP1", 0, SPR_PUMA, FF_FULLBRIGHT  , 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_UP2, 0},
-	{"S_PUMA_UP2", 0, SPR_PUMA, FF_FULLBRIGHT|1, 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_UP3, 0},
-	{"S_PUMA_UP3", 0, SPR_PUMA, FF_FULLBRIGHT|2, 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_UP1, 0},
-	{"S_PUMA_DOWN1", 0, SPR_PUMA, FF_FULLBRIGHT|3, 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_DOWN2, 0},
-	{"S_PUMA_DOWN2", 0, SPR_PUMA, FF_FULLBRIGHT|4, 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_DOWN3, 0},
-	{"S_PUMA_DOWN3", 0, SPR_PUMA, FF_FULLBRIGHT|5, 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_DOWN1, 0},
-
-	{"S_PUMATRAIL1", 0, SPR_PUMA, FF_FULLBRIGHT|FF_TRANS20|6, 4,       {NULL},        0, 0, S_PUMATRAIL2, 0},
-	{"S_PUMATRAIL2", 0, SPR_PUMA, FF_FULLBRIGHT|FF_TRANS40|6, 5, {A_SetScale}, FRACUNIT, 1, S_PUMATRAIL3, 0},
-	{"S_PUMATRAIL3", 0, SPR_PUMA, FF_FULLBRIGHT|FF_TRANS50|7, 4,       {NULL},        0, 0, S_PUMATRAIL4, 0},
-	{"S_PUMATRAIL4", 0, SPR_PUMA, FF_FULLBRIGHT|FF_TRANS60|8, 3,       {NULL},        0, 0, S_NULL, 0},
+	{"PUMA_START1", 0, SPR_PUMA, FF_FULLBRIGHT|2, 1, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_START2, 0},
+	{"PUMA_START2", 0, SPR_PUMA, FF_FULLBRIGHT|2, 1, {A_PlaySound}, sfx_s3k70, 1 + (1<<16), S_PUMA_UP1, 0},
+	{"PUMA_UP1", 0, SPR_PUMA, FF_FULLBRIGHT  , 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_UP2, 0},
+	{"PUMA_UP2", 0, SPR_PUMA, FF_FULLBRIGHT|1, 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_UP3, 0},
+	{"PUMA_UP3", 0, SPR_PUMA, FF_FULLBRIGHT|2, 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_UP1, 0},
+	{"PUMA_DOWN1", 0, SPR_PUMA, FF_FULLBRIGHT|3, 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_DOWN2, 0},
+	{"PUMA_DOWN2", 0, SPR_PUMA, FF_FULLBRIGHT|4, 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_DOWN3, 0},
+	{"PUMA_DOWN3", 0, SPR_PUMA, FF_FULLBRIGHT|5, 2, {A_FishJump}, 0, MT_PUMATRAIL, S_PUMA_DOWN1, 0},
+
+	{"PUMATRAIL1", 0, SPR_PUMA, FF_FULLBRIGHT|FF_TRANS20|6, 4,       {NULL},        0, 0, S_PUMATRAIL2, 0},
+	{"PUMATRAIL2", 0, SPR_PUMA, FF_FULLBRIGHT|FF_TRANS40|6, 5, {A_SetScale}, FRACUNIT, 1, S_PUMATRAIL3, 0},
+	{"PUMATRAIL3", 0, SPR_PUMA, FF_FULLBRIGHT|FF_TRANS50|7, 4,       {NULL},        0, 0, S_PUMATRAIL4, 0},
+	{"PUMATRAIL4", 0, SPR_PUMA, FF_FULLBRIGHT|FF_TRANS60|8, 3,       {NULL},        0, 0, S_NULL, 0},
 
 	// Hammer
-	{"S_HAMMER", 0, SPR_HAMM, FF_ANIMATE, -1, {NULL}, 3, 3, S_NULL, 0},
+	{"HAMMER", 0, SPR_HAMM, FF_ANIMATE, -1, {NULL}, 3, 3, S_NULL, 0},
 
 	// Koopa
-	{"S_KOOPA1", 0, SPR_KOOP, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_KOOPA2", 0, SPR_KOOP, 1, 24, {NULL}, 0, 0, S_KOOPA1, 0},
+	{"KOOPA1", 0, SPR_KOOP, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"KOOPA2", 0, SPR_KOOP, 1, 24, {NULL}, 0, 0, S_KOOPA1, 0},
 
-	{"S_KOOPAFLAME1", 0, SPR_BFLM, 0, 3,{NULL}, 0, 0, S_KOOPAFLAME2, 0},
-	{"S_KOOPAFLAME2", 0, SPR_BFLM, 1, 3,{NULL}, 0, 0, S_KOOPAFLAME3, 0},
-	{"S_KOOPAFLAME3", 0, SPR_BFLM, 2, 3,{NULL}, 0, 0, S_KOOPAFLAME1, 0},
+	{"KOOPAFLAME1", 0, SPR_BFLM, 0, 3,{NULL}, 0, 0, S_KOOPAFLAME2, 0},
+	{"KOOPAFLAME2", 0, SPR_BFLM, 1, 3,{NULL}, 0, 0, S_KOOPAFLAME3, 0},
+	{"KOOPAFLAME3", 0, SPR_BFLM, 2, 3,{NULL}, 0, 0, S_KOOPAFLAME1, 0},
 
 	// Axe
-	{"S_AXE1", 0, SPR_MAXE, 0, 3, {NULL}, 0, 0, S_AXE2, 0},
-	{"S_AXE2", 0, SPR_MAXE, 1, 3, {NULL}, 0, 0, S_AXE3, 0},
-	{"S_AXE3", 0, SPR_MAXE, 2, 3, {NULL}, 0, 0, S_AXE1, 0},
+	{"AXE1", 0, SPR_MAXE, 0, 3, {NULL}, 0, 0, S_AXE2, 0},
+	{"AXE2", 0, SPR_MAXE, 1, 3, {NULL}, 0, 0, S_AXE3, 0},
+	{"AXE3", 0, SPR_MAXE, 2, 3, {NULL}, 0, 0, S_AXE1, 0},
 
-	{"S_MARIOBUSH1", 0, SPR_MUS1, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_MARIOBUSH2", 0, SPR_MUS2, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_TOAD", 0, SPR_TOAD, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"MARIOBUSH1", 0, SPR_MUS1, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"MARIOBUSH2", 0, SPR_MUS2, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"TOAD", 0, SPR_TOAD, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Nights Drone
-	{"S_NIGHTSDRONE_MAN1", 0, SPR_NDRN, 0, -1, {NULL}, 0, 0, S_NIGHTSDRONE_MAN2, 0},
-	{"S_NIGHTSDRONE_MAN2", 0, SPR_NDRN, 0, -1, {NULL}, 0, 0, S_NIGHTSDRONE_MAN1, 0},
+	{"NIGHTSDRONE_MAN1", 0, SPR_NDRN, 0, -1, {NULL}, 0, 0, S_NIGHTSDRONE_MAN2, 0},
+	{"NIGHTSDRONE_MAN2", 0, SPR_NDRN, 0, -1, {NULL}, 0, 0, S_NIGHTSDRONE_MAN1, 0},
 
 	// Sparkling point (RETURN TO THE GOAL, etc)
-	{"S_NIGHTSDRONE_SPARKLING1", 0, SPR_IVSP, 0, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING2, 0},
-	{"S_NIGHTSDRONE_SPARKLING2", 0, SPR_IVSP, 2, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING3, 0},
-	{"S_NIGHTSDRONE_SPARKLING3", 0, SPR_IVSP, 4, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING4, 0},
-	{"S_NIGHTSDRONE_SPARKLING4", 0, SPR_IVSP, 6, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING5, 0},
-	{"S_NIGHTSDRONE_SPARKLING5", 0, SPR_IVSP, 8, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING6, 0},
-	{"S_NIGHTSDRONE_SPARKLING6", 0, SPR_IVSP, 10, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING7, 0},
-	{"S_NIGHTSDRONE_SPARKLING7", 0, SPR_IVSP, 12, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING8, 0},
-	{"S_NIGHTSDRONE_SPARKLING8", 0, SPR_IVSP, 14, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING9, 0},
-	{"S_NIGHTSDRONE_SPARKLING9", 0, SPR_IVSP, 16, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING10, 0},
-	{"S_NIGHTSDRONE_SPARKLING10", 0, SPR_IVSP, 18, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING11, 0},
-	{"S_NIGHTSDRONE_SPARKLING11", 0, SPR_IVSP, 20, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING12, 0},
-	{"S_NIGHTSDRONE_SPARKLING12", 0, SPR_IVSP, 22, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING13, 0},
-	{"S_NIGHTSDRONE_SPARKLING13", 0, SPR_IVSP, 24, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING14, 0},
-	{"S_NIGHTSDRONE_SPARKLING14", 0, SPR_IVSP, 26, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING15, 0},
-	{"S_NIGHTSDRONE_SPARKLING15", 0, SPR_IVSP, 28, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING16, 0},
-	{"S_NIGHTSDRONE_SPARKLING16", 0, SPR_IVSP, 30, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING1, 0},
+	{"NIGHTSDRONE_SPARKLING1", 0, SPR_IVSP, 0, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING2, 0},
+	{"NIGHTSDRONE_SPARKLING2", 0, SPR_IVSP, 2, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING3, 0},
+	{"NIGHTSDRONE_SPARKLING3", 0, SPR_IVSP, 4, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING4, 0},
+	{"NIGHTSDRONE_SPARKLING4", 0, SPR_IVSP, 6, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING5, 0},
+	{"NIGHTSDRONE_SPARKLING5", 0, SPR_IVSP, 8, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING6, 0},
+	{"NIGHTSDRONE_SPARKLING6", 0, SPR_IVSP, 10, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING7, 0},
+	{"NIGHTSDRONE_SPARKLING7", 0, SPR_IVSP, 12, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING8, 0},
+	{"NIGHTSDRONE_SPARKLING8", 0, SPR_IVSP, 14, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING9, 0},
+	{"NIGHTSDRONE_SPARKLING9", 0, SPR_IVSP, 16, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING10, 0},
+	{"NIGHTSDRONE_SPARKLING10", 0, SPR_IVSP, 18, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING11, 0},
+	{"NIGHTSDRONE_SPARKLING11", 0, SPR_IVSP, 20, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING12, 0},
+	{"NIGHTSDRONE_SPARKLING12", 0, SPR_IVSP, 22, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING13, 0},
+	{"NIGHTSDRONE_SPARKLING13", 0, SPR_IVSP, 24, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING14, 0},
+	{"NIGHTSDRONE_SPARKLING14", 0, SPR_IVSP, 26, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING15, 0},
+	{"NIGHTSDRONE_SPARKLING15", 0, SPR_IVSP, 28, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING16, 0},
+	{"NIGHTSDRONE_SPARKLING16", 0, SPR_IVSP, 30, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING1, 0},
 
 	// NiGHTS GOAL banner (inside the sparkles!)
-	{"S_NIGHTSDRONE_GOAL1", 0, SPR_GOAL, 0, 4, {NULL}, 0, 0, S_NIGHTSDRONE_GOAL2, 0},
-	{"S_NIGHTSDRONE_GOAL2", 0, SPR_GOAL, 1, 4, {NULL}, 0, 0, S_NIGHTSDRONE_GOAL3, 0},
-	{"S_NIGHTSDRONE_GOAL3", 0, SPR_GOAL, 2, 4, {NULL}, 0, 0, S_NIGHTSDRONE_GOAL4, 0},
-	{"S_NIGHTSDRONE_GOAL4", 0, SPR_GOAL, 3, 4, {NULL}, 0, 0, S_NIGHTSDRONE_GOAL1, 0},
+	{"NIGHTSDRONE_GOAL1", 0, SPR_GOAL, 0, 4, {NULL}, 0, 0, S_NIGHTSDRONE_GOAL2, 0},
+	{"NIGHTSDRONE_GOAL2", 0, SPR_GOAL, 1, 4, {NULL}, 0, 0, S_NIGHTSDRONE_GOAL3, 0},
+	{"NIGHTSDRONE_GOAL3", 0, SPR_GOAL, 2, 4, {NULL}, 0, 0, S_NIGHTSDRONE_GOAL4, 0},
+	{"NIGHTSDRONE_GOAL4", 0, SPR_GOAL, 3, 4, {NULL}, 0, 0, S_NIGHTSDRONE_GOAL1, 0},
 
 	// Nights Sparkle
-	{"S_NIGHTSPARKLE1", 0, SPR_NSPK, FF_FULLBRIGHT, 140, {NULL}, 0, 0, S_NIGHTSPARKLE2, 0},
-	{"S_NIGHTSPARKLE2", 0, SPR_NSPK, FF_FULLBRIGHT|1, 7, {NULL}, 0, 0, S_NIGHTSPARKLE3, 0},
-	{"S_NIGHTSPARKLE3", 0, SPR_NSPK, FF_FULLBRIGHT|2, 7, {NULL}, 0, 0, S_NIGHTSPARKLE4, 0},
-	{"S_NIGHTSPARKLE4", 0, SPR_NSPK, FF_FULLBRIGHT|3, 7, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSPARKLE1", 0, SPR_NSPK, FF_FULLBRIGHT, 140, {NULL}, 0, 0, S_NIGHTSPARKLE2, 0},
+	{"NIGHTSPARKLE2", 0, SPR_NSPK, FF_FULLBRIGHT|1, 7, {NULL}, 0, 0, S_NIGHTSPARKLE3, 0},
+	{"NIGHTSPARKLE3", 0, SPR_NSPK, FF_FULLBRIGHT|2, 7, {NULL}, 0, 0, S_NIGHTSPARKLE4, 0},
+	{"NIGHTSPARKLE4", 0, SPR_NSPK, FF_FULLBRIGHT|3, 7, {NULL}, 0, 0, S_NULL, 0},
 
 	// Red Sparkle
-	{"S_NIGHTSPARKLESUPER1", 0, SPR_NSPK, FF_FULLBRIGHT|4, 140, {NULL}, 0, 0, S_NIGHTSPARKLESUPER2, 0},
-	{"S_NIGHTSPARKLESUPER2", 0, SPR_NSPK, FF_FULLBRIGHT|5, 7, {NULL}, 0, 0, S_NIGHTSPARKLESUPER3, 0},
-	{"S_NIGHTSPARKLESUPER3", 0, SPR_NSPK, FF_FULLBRIGHT|6, 7, {NULL}, 0, 0, S_NIGHTSPARKLESUPER4, 0},
-	{"S_NIGHTSPARKLESUPER4", 0, SPR_NSPK, FF_FULLBRIGHT|7, 7, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSPARKLESUPER1", 0, SPR_NSPK, FF_FULLBRIGHT|4, 140, {NULL}, 0, 0, S_NIGHTSPARKLESUPER2, 0},
+	{"NIGHTSPARKLESUPER2", 0, SPR_NSPK, FF_FULLBRIGHT|5, 7, {NULL}, 0, 0, S_NIGHTSPARKLESUPER3, 0},
+	{"NIGHTSPARKLESUPER3", 0, SPR_NSPK, FF_FULLBRIGHT|6, 7, {NULL}, 0, 0, S_NIGHTSPARKLESUPER4, 0},
+	{"NIGHTSPARKLESUPER4", 0, SPR_NSPK, FF_FULLBRIGHT|7, 7, {NULL}, 0, 0, S_NULL, 0},
 
 	// Paraloop helper -- THIS IS WHAT DETERMINES THE TIMER NOW
-	{"S_NIGHTSLOOPHELPER", 0, SPR_NULL, 0, 160, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSLOOPHELPER", 0, SPR_NULL, 0, 160, {NULL}, 0, 0, S_NULL, 0},
 
 	// NiGHTS bumper
-	{"S_NIGHTSBUMPER1", 0, SPR_NBMP, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSBUMPER2", 0, SPR_NBMP, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSBUMPER3", 0, SPR_NBMP, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSBUMPER4", 0, SPR_NBMP, 3, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSBUMPER5", 0, SPR_NBMP, 4, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSBUMPER6", 0, SPR_NBMP, 5, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSBUMPER7", 0, SPR_NBMP, 6, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSBUMPER8", 0, SPR_NBMP, 7, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSBUMPER9", 0, SPR_NBMP, 8, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSBUMPER10", 0, SPR_NBMP, 9, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSBUMPER11", 0, SPR_NBMP, 10, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSBUMPER12", 0, SPR_NBMP, 11, -1, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_HOOP", 0, SPR_HOOP, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_HOOP_XMASA", 0, SPR_HOOP, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_HOOP_XMASB", 0, SPR_HOOP, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_NIGHTSCORE10", 0, SPR_NSCR, FF_FULLBRIGHT,    -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE20", 0, SPR_NSCR, FF_FULLBRIGHT|1,  -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE30", 0, SPR_NSCR, FF_FULLBRIGHT|2,  -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE40", 0, SPR_NSCR, FF_FULLBRIGHT|3,  -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE50", 0, SPR_NSCR, FF_FULLBRIGHT|4,  -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE60", 0, SPR_NSCR, FF_FULLBRIGHT|5,  -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE70", 0, SPR_NSCR, FF_FULLBRIGHT|6,  -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE80", 0, SPR_NSCR, FF_FULLBRIGHT|7,  -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE90", 0, SPR_NSCR, FF_FULLBRIGHT|8,  -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE100", 0, SPR_NSCR, FF_FULLBRIGHT|9,  -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE10_2", 0, SPR_NSCR, FF_FULLBRIGHT|10, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE20_2", 0, SPR_NSCR, FF_FULLBRIGHT|11, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE30_2", 0, SPR_NSCR, FF_FULLBRIGHT|12, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE40_2", 0, SPR_NSCR, FF_FULLBRIGHT|13, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE50_2", 0, SPR_NSCR, FF_FULLBRIGHT|14, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE60_2", 0, SPR_NSCR, FF_FULLBRIGHT|15, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE70_2", 0, SPR_NSCR, FF_FULLBRIGHT|16, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE80_2", 0, SPR_NSCR, FF_FULLBRIGHT|17, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE90_2", 0, SPR_NSCR, FF_FULLBRIGHT|18, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSCORE100_2", 0, SPR_NSCR, FF_FULLBRIGHT|19, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSBUMPER1", 0, SPR_NBMP, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSBUMPER2", 0, SPR_NBMP, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSBUMPER3", 0, SPR_NBMP, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSBUMPER4", 0, SPR_NBMP, 3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSBUMPER5", 0, SPR_NBMP, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSBUMPER6", 0, SPR_NBMP, 5, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSBUMPER7", 0, SPR_NBMP, 6, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSBUMPER8", 0, SPR_NBMP, 7, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSBUMPER9", 0, SPR_NBMP, 8, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSBUMPER10", 0, SPR_NBMP, 9, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSBUMPER11", 0, SPR_NBMP, 10, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSBUMPER12", 0, SPR_NBMP, 11, -1, {NULL}, 0, 0, S_NULL, 0},
+
+	{"HOOP", 0, SPR_HOOP, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"HOOP_XMASA", 0, SPR_HOOP, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"HOOP_XMASB", 0, SPR_HOOP, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+
+	{"NIGHTSCORE10", 0, SPR_NSCR, FF_FULLBRIGHT,    -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE20", 0, SPR_NSCR, FF_FULLBRIGHT|1,  -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE30", 0, SPR_NSCR, FF_FULLBRIGHT|2,  -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE40", 0, SPR_NSCR, FF_FULLBRIGHT|3,  -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE50", 0, SPR_NSCR, FF_FULLBRIGHT|4,  -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE60", 0, SPR_NSCR, FF_FULLBRIGHT|5,  -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE70", 0, SPR_NSCR, FF_FULLBRIGHT|6,  -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE80", 0, SPR_NSCR, FF_FULLBRIGHT|7,  -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE90", 0, SPR_NSCR, FF_FULLBRIGHT|8,  -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE100", 0, SPR_NSCR, FF_FULLBRIGHT|9,  -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE10_2", 0, SPR_NSCR, FF_FULLBRIGHT|10, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE20_2", 0, SPR_NSCR, FF_FULLBRIGHT|11, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE30_2", 0, SPR_NSCR, FF_FULLBRIGHT|12, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE40_2", 0, SPR_NSCR, FF_FULLBRIGHT|13, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE50_2", 0, SPR_NSCR, FF_FULLBRIGHT|14, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE60_2", 0, SPR_NSCR, FF_FULLBRIGHT|15, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE70_2", 0, SPR_NSCR, FF_FULLBRIGHT|16, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE80_2", 0, SPR_NSCR, FF_FULLBRIGHT|17, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE90_2", 0, SPR_NSCR, FF_FULLBRIGHT|18, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSCORE100_2", 0, SPR_NSCR, FF_FULLBRIGHT|19, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// NiGHTS Paraloop Powerups
-	{"S_NIGHTSSUPERLOOP", 0, SPR_NPRU, 0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSDRILLREFILL", 0, SPR_NPRU, 1, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSHELPER", 0, SPR_NPRU, 2, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSEXTRATIME", 0, SPR_NPRU, 3, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_NIGHTSLINKFREEZE", 0, SPR_NPRU, 4, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSSUPERLOOP", 0, SPR_NPRU, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSDRILLREFILL", 0, SPR_NPRU, 1, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSHELPER", 0, SPR_NPRU, 2, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSEXTRATIME", 0, SPR_NPRU, 3, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"NIGHTSLINKFREEZE", 0, SPR_NPRU, 4, -1, {NULL}, 0, 0, S_NULL, 0},
 
-	{"S_EGGCAPSULE", 0, SPR_CAPS, 0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"EGGCAPSULE", 0, SPR_CAPS, 0, -1, {NULL}, 0, 0, S_NULL, 0},
 
 	// Orbiting Chaos Emeralds/Ideya for NiGHTS
-	{"S_ORBITEM1", 0, SPR_CEMG, FF_FULLBRIGHT,   1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM1, 0},
-	{"S_ORBITEM2", 0, SPR_CEMG, FF_FULLBRIGHT|1, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM2, 0},
-	{"S_ORBITEM3", 0, SPR_CEMG, FF_FULLBRIGHT|2, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM3, 0},
-	{"S_ORBITEM4", 0, SPR_CEMG, FF_FULLBRIGHT|3, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM4, 0},
-	{"S_ORBITEM5", 0, SPR_CEMG, FF_FULLBRIGHT|4, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM5, 0},
-	{"S_ORBITEM6", 0, SPR_CEMG, FF_FULLBRIGHT|5, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM6, 0},
-	{"S_ORBITEM7", 0, SPR_CEMG, FF_FULLBRIGHT|6, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM7, 0},
-	{"S_ORBITEM8", 0, SPR_CEMG, FF_FULLBRIGHT|7, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8, 0},
-	{"S_ORBIDYA1", 0, SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT,   1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA1, 0},
-	{"S_ORBIDYA2", 0, SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|1, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA2, 0},
-	{"S_ORBIDYA3", 0, SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|2, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA3, 0},
-	{"S_ORBIDYA4", 0, SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|3, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA4, 0},
-	{"S_ORBIDYA5", 0, SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|4, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA5, 0},
+	{"ORBITEM1", 0, SPR_CEMG, FF_FULLBRIGHT,   1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM1, 0},
+	{"ORBITEM2", 0, SPR_CEMG, FF_FULLBRIGHT|1, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM2, 0},
+	{"ORBITEM3", 0, SPR_CEMG, FF_FULLBRIGHT|2, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM3, 0},
+	{"ORBITEM4", 0, SPR_CEMG, FF_FULLBRIGHT|3, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM4, 0},
+	{"ORBITEM5", 0, SPR_CEMG, FF_FULLBRIGHT|4, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM5, 0},
+	{"ORBITEM6", 0, SPR_CEMG, FF_FULLBRIGHT|5, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM6, 0},
+	{"ORBITEM7", 0, SPR_CEMG, FF_FULLBRIGHT|6, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM7, 0},
+	{"ORBITEM8", 0, SPR_CEMG, FF_FULLBRIGHT|7, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8, 0},
+	{"ORBIDYA1", 0, SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT,   1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA1, 0},
+	{"ORBIDYA2", 0, SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|1, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA2, 0},
+	{"ORBIDYA3", 0, SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|2, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA3, 0},
+	{"ORBIDYA4", 0, SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|3, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA4, 0},
+	{"ORBIDYA5", 0, SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|4, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA5, 0},
 
 	// Flicky helper for NiGHTS
-	{"S_NIGHTOPIANHELPER1", 0, SPR_FL01, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER2, 0},
-	{"S_NIGHTOPIANHELPER2", 0, SPR_FL01, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER3, 0},
-	{"S_NIGHTOPIANHELPER3", 0, SPR_FL01, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER4, 0},
-	{"S_NIGHTOPIANHELPER4", 0, SPR_FL01, 2, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER5, 0},
-	{"S_NIGHTOPIANHELPER5", 0, SPR_FL01, 2, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER6, 0},
-	{"S_NIGHTOPIANHELPER6", 0, SPR_FL01, 2, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER7, 0},
-	{"S_NIGHTOPIANHELPER7", 0, SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER8, 0},
-	{"S_NIGHTOPIANHELPER8", 0, SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER9, 0},
-	{"S_NIGHTOPIANHELPER9", 0, SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER1, 0},
+	{"NIGHTOPIANHELPER1", 0, SPR_FL01, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER2, 0},
+	{"NIGHTOPIANHELPER2", 0, SPR_FL01, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER3, 0},
+	{"NIGHTOPIANHELPER3", 0, SPR_FL01, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER4, 0},
+	{"NIGHTOPIANHELPER4", 0, SPR_FL01, 2, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER5, 0},
+	{"NIGHTOPIANHELPER5", 0, SPR_FL01, 2, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER6, 0},
+	{"NIGHTOPIANHELPER6", 0, SPR_FL01, 2, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER7, 0},
+	{"NIGHTOPIANHELPER7", 0, SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER8, 0},
+	{"NIGHTOPIANHELPER8", 0, SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER9, 0},
+	{"NIGHTOPIANHELPER9", 0, SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER1, 0},
 
 	// Nightopian
-	{"S_PIAN_LOOK1", 0, SPR_NTPN, 0, 2, {A_Look}, 1, 1, S_PIAN_LOOK2, 0},
-	{"S_PIAN_LOOK2", 0, SPR_NTPN, 1, 2, {A_Look}, 1, 1, S_PIAN_LOOK3, 0},
-	{"S_PIAN_LOOK3", 0, SPR_NTPN, 2, 2, {A_Look}, 1, 1, S_PIAN_LOOK1, 0},
-	{"S_PIAN_FLY1", 0, SPR_NTPN, 0, 2, {A_JetgThink}, 0, 0, S_PIAN_FLY2, 0},
-	{"S_PIAN_FLY2", 0, SPR_NTPN, 1, 2, {NULL}, 0, 0, S_PIAN_FLY3, 0},
-	{"S_PIAN_FLY3", 0, SPR_NTPN, 2, 2, {NULL}, 0, 0, S_PIAN_FLY1, 0},
-	{"S_PIAN_SING", 0, SPR_NTPN, 3|FF_ANIMATE, 24, {NULL}, 2, 2, S_PIAN_FLY1, 0},
+	{"PIAN_LOOK1", 0, SPR_NTPN, 0, 2, {A_Look}, 1, 1, S_PIAN_LOOK2, 0},
+	{"PIAN_LOOK2", 0, SPR_NTPN, 1, 2, {A_Look}, 1, 1, S_PIAN_LOOK3, 0},
+	{"PIAN_LOOK3", 0, SPR_NTPN, 2, 2, {A_Look}, 1, 1, S_PIAN_LOOK1, 0},
+	{"PIAN_FLY1", 0, SPR_NTPN, 0, 2, {A_JetgThink}, 0, 0, S_PIAN_FLY2, 0},
+	{"PIAN_FLY2", 0, SPR_NTPN, 1, 2, {NULL}, 0, 0, S_PIAN_FLY3, 0},
+	{"PIAN_FLY3", 0, SPR_NTPN, 2, 2, {NULL}, 0, 0, S_PIAN_FLY1, 0},
+	{"PIAN_SING", 0, SPR_NTPN, 3|FF_ANIMATE, 24, {NULL}, 2, 2, S_PIAN_FLY1, 0},
 
 	// Shleep
-	{"S_SHLEEP1", 0, SPR_SHLP, 0, 15, {NULL}, 0, 0, S_SHLEEP2, 0},
-	{"S_SHLEEP2", 0, SPR_SHLP, 1, 15, {NULL}, 0, 0, S_SHLEEP3, 0},
-	{"S_SHLEEP3", 0, SPR_SHLP, 2, 15, {NULL}, 0, 0, S_SHLEEP4, 0},
-	{"S_SHLEEP4", 0, SPR_SHLP, 1, 15, {NULL}, 0, 0, S_SHLEEP1, 0},
-	{"S_SHLEEPBOUNCE1", 0, SPR_SHLP, 3, 1, {A_Scream},  0, 0, S_SHLEEPBOUNCE2, 0},
-	{"S_SHLEEPBOUNCE2", 0, SPR_SHLP, 3, 1, {A_ZThrust}, 9, 0, S_SHLEEPBOUNCE3, 0},
-	{"S_SHLEEPBOUNCE3", 0, SPR_SHLP, 3, 400, {A_SetObjectFlags}, MF_SLIDEME|MF_ENEMY|MF_BOUNCE|MF_NOCLIP|MF_NOCLIPHEIGHT, 0, S_NULL, 0},
+	{"SHLEEP1", 0, SPR_SHLP, 0, 15, {NULL}, 0, 0, S_SHLEEP2, 0},
+	{"SHLEEP2", 0, SPR_SHLP, 1, 15, {NULL}, 0, 0, S_SHLEEP3, 0},
+	{"SHLEEP3", 0, SPR_SHLP, 2, 15, {NULL}, 0, 0, S_SHLEEP4, 0},
+	{"SHLEEP4", 0, SPR_SHLP, 1, 15, {NULL}, 0, 0, S_SHLEEP1, 0},
+	{"SHLEEPBOUNCE1", 0, SPR_SHLP, 3, 1, {A_Scream},  0, 0, S_SHLEEPBOUNCE2, 0},
+	{"SHLEEPBOUNCE2", 0, SPR_SHLP, 3, 1, {A_ZThrust}, 9, 0, S_SHLEEPBOUNCE3, 0},
+	{"SHLEEPBOUNCE3", 0, SPR_SHLP, 3, 400, {A_SetObjectFlags}, MF_SLIDEME|MF_ENEMY|MF_BOUNCE|MF_NOCLIP|MF_NOCLIPHEIGHT, 0, S_NULL, 0},
 
 	// Secret badniks and hazards, shhhh
-	{"S_PENGUINATOR_LOOK", 0, SPR_PENG, 0, 2, {A_Look},  0, 0, S_PENGUINATOR_LOOK, 0},
-	{"S_PENGUINATOR_WADDLE1", 0, SPR_PENG, 0, 2, {A_Chase}, 0, 0, S_PENGUINATOR_WADDLE2, 0},
-	{"S_PENGUINATOR_WADDLE2", 0, SPR_PENG, 1, 2, {A_Chase}, 0, 0, S_PENGUINATOR_WADDLE3, 0},
-	{"S_PENGUINATOR_WADDLE3", 0, SPR_PENG, 0, 2, {A_Chase}, 0, 0, S_PENGUINATOR_WADDLE4, 0},
-	{"S_PENGUINATOR_WADDLE4", 0, SPR_PENG, 2, 2, {A_Chase}, 0, 0, S_PENGUINATOR_WADDLE1, 0},
-	{"S_PENGUINATOR_SLIDE1", 0, SPR_PENG, 0,  0, {A_FaceTarget},      0,  0, S_PENGUINATOR_SLIDE2, 0},
-	{"S_PENGUINATOR_SLIDE2", 0, SPR_PENG, 3,  5, {A_BunnyHop},        4, 10, S_PENGUINATOR_SLIDE3, 0},
-	{"S_PENGUINATOR_SLIDE3", 0, SPR_PENG, 4, 90, {A_PlayAttackSound}, 0,  0, S_PENGUINATOR_SLIDE4, 0},
-	{"S_PENGUINATOR_SLIDE4", 0, SPR_PENG, 3,  5, {A_Thrust},          0,  1, S_PENGUINATOR_SLIDE5, 0},
-	{"S_PENGUINATOR_SLIDE5", 0, SPR_PENG, 0,  5, {A_FaceTarget},      0,  0, S_PENGUINATOR_LOOK, 0},
-
-	{"S_POPHAT_LOOK", 0, SPR_POPH, 0,  2, {A_Look},  (2048<<16)|1,           0, S_POPHAT_LOOK, 0},
-	{"S_POPHAT_SHOOT1", 0, SPR_POPH, 1,  0, {A_MultiShotDist}, (MT_SPINDUST<<16)|4, 24, S_POPHAT_SHOOT2, 0},
-	{"S_POPHAT_SHOOT2", 0, SPR_POPH, 1,  2, {A_LobShot}, MT_POPSHOT, (70<<16)|60, S_POPHAT_SHOOT3, 0},
-	{"S_POPHAT_SHOOT3", 0, SPR_POPH, 2,  1, {NULL},               0,           0, S_POPHAT_SHOOT4, 0},
-	{"S_POPHAT_SHOOT4", 0, SPR_POPH, 0, 57, {NULL},               0,           0, S_POPHAT_LOOK, 0},
-	{"S_POPSHOT", 0, SPR_POPH, 3,  3, {A_SpawnObjectRelative}, 0, MT_POPSHOT_TRAIL, S_POPSHOT, 0},
-	{"S_POPSHOT_TRAIL", 0, SPR_NULL, 0,  2, {NULL},                  0, 0,                S_SPINDUST1, 0},
-
-	{"S_HIVEELEMENTAL_LOOK", 0, SPR_HIVE, 0,  5, {A_Look}, 1, 1, S_HIVEELEMENTAL_LOOK, 0},
-	{"S_HIVEELEMENTAL_PREPARE1", 0, SPR_HIVE, 0, 14, {A_PlaySound}, sfx_s3k76, 1, S_HIVEELEMENTAL_PREPARE2, 0},
-	{"S_HIVEELEMENTAL_PREPARE2", 0, SPR_HIVE, 0,  6, {A_PlaySound}, sfx_s3k8c, 1, S_HIVEELEMENTAL_SHOOT1, 0},
-	{"S_HIVEELEMENTAL_SHOOT1", 0, SPR_HIVE, 1,  4, {A_WhoCaresIfYourSonIsABee}, (MT_BUMBLEBORE<<16)|4, (1<<16)|32, S_HIVEELEMENTAL_SHOOT2, 0},
-	{"S_HIVEELEMENTAL_SHOOT2", 0, SPR_HIVE, 2,  2, {NULL}, 0, 0, S_HIVEELEMENTAL_DORMANT, 0},
-	{"S_HIVEELEMENTAL_DORMANT", 0, SPR_HIVE, 0,  5, {A_ParentTriesToSleep}, S_HIVEELEMENTAL_PREPARE1, 0, S_HIVEELEMENTAL_DORMANT, 0},
-	{"S_HIVEELEMENTAL_PAIN", 0, SPR_HIVE, 3, 35, {A_Pain}, 0, 0, S_HIVEELEMENTAL_LOOK, 0},
-	{"S_HIVEELEMENTAL_DIE1", 0, SPR_HIVE, 3,  2, {A_BossScream}, 1, 0, S_HIVEELEMENTAL_DIE2, 0},
-	{"S_HIVEELEMENTAL_DIE2", 0, SPR_NULL, 0,  2, {A_BossScream}, 1, 0, S_HIVEELEMENTAL_DIE3, 0},
-	{"S_HIVEELEMENTAL_DIE3", 0, SPR_NULL, 0,  0, {A_Repeat}, 7, S_HIVEELEMENTAL_DIE1, S_XPLD_FLICKY, 0},
-
-	{"S_BUMBLEBORE_SPAWN", 0, SPR_BUMB, 1, 10, {NULL}, 0, 0, S_BUMBLEBORE_LOOK1, 0},
-	{"S_BUMBLEBORE_LOOK1", 0, SPR_BUMB, 0,  4, {A_Look}, 1, 1, S_BUMBLEBORE_LOOK2, 0},
-	{"S_BUMBLEBORE_LOOK2", 0, SPR_BUMB, 1,  4, {A_Look}, 1, 1, S_BUMBLEBORE_LOOK1, 0},
-	{"S_BUMBLEBORE_FLY1", 0, SPR_BUMB, 0,  4, {A_JetbThink}, 0, 0, S_BUMBLEBORE_FLY2, 0},
-	{"S_BUMBLEBORE_FLY2", 0, SPR_BUMB, 1,  4, {A_JetbThink}, 0, 0, S_BUMBLEBORE_FLY1, 0},
-	{"S_BUMBLEBORE_RAISE", 0, SPR_BUMB, 2|FF_FULLBRIGHT,  12, {A_ZThrust},  4, (1<<16)|1, S_BUMBLEBORE_FALL1, 0},
-	{"S_BUMBLEBORE_FALL1", 0, SPR_BUMB, 2|FF_FULLBRIGHT,   0, {A_ZThrust}, -8, (1<<16)|1, S_BUMBLEBORE_FALL2, 0},
-	{"S_BUMBLEBORE_FALL2", 0, SPR_BUMB, 2|FF_FULLBRIGHT, 300, {NULL},       0,         0, S_BUMBLEBORE_DIE, 0},
-	{"S_BUMBLEBORE_STUCK1", 0, SPR_BUMB, 4, 3, {A_MultiShotDist}, (MT_DUST<<16)|6, -40, S_BUMBLEBORE_STUCK2, 0},
-	{"S_BUMBLEBORE_STUCK2", 0, SPR_BUMB, 5, 120, {NULL}, 0, 0, S_BUMBLEBORE_DIE, 0},
-	{"S_BUMBLEBORE_DIE", 0, SPR_BUMB, 5, 0, {A_CryingToMomma}, 0, 0, S_XPLD1, 0},
-
-	{"S_BUGGLEIDLE", 0, SPR_BBUZ,          0, -1, {NULL}, 0, 0, S_NULL, 0},
-	{"S_BUGGLEFLY", 0, SPR_BBUZ, FF_ANIMATE, -1, {NULL}, 1, 2, S_NULL, 0},
-
-	{"S_SMASHSPIKE_FLOAT", 0, SPR_FMCE, 0, 20, {NULL}, 0, 0, S_SMASHSPIKE_EASE1, 0},
-	{"S_SMASHSPIKE_EASE1", 0, SPR_FMCE, 0,  4, {A_ZThrust},  4, (1<<16)|1, S_SMASHSPIKE_EASE2, 0},
-	{"S_SMASHSPIKE_EASE2", 0, SPR_FMCE, 0,  4, {A_ZThrust},  0, (1<<16)|1, S_SMASHSPIKE_FALL, 0},
-	{"S_SMASHSPIKE_FALL", 0, SPR_FMCE, 0,  2, {A_ZThrust}, -6,         1, S_SMASHSPIKE_FALL, 0},
-	{"S_SMASHSPIKE_STOMP1", 0, SPR_FMCE, 1,  2, {A_MultiShotDist}, (MT_DUST<<16)|10, -48, S_SMASHSPIKE_STOMP2, 0},
-	{"S_SMASHSPIKE_STOMP2", 0, SPR_FMCE, 2, 14, {NULL}, 0, 0, S_SMASHSPIKE_RISE1, 0},
-	{"S_SMASHSPIKE_RISE1", 0, SPR_FMCE, 1,  2, {NULL}, 0, 0, S_SMASHSPIKE_RISE2, 0},
-	{"S_SMASHSPIKE_RISE2", 0, SPR_FMCE, 0,  2, {A_ZThrust}, 6, (1<<16)|1, S_SMASHSPIKE_RISE2, 0},
-
-	{"S_CACO_LOOK", 0, SPR_CACO, 0,  5, {A_Look}, (1100<<16)|1, 0, S_CACO_LOOK, 0},
-	{"S_CACO_WAKE1", 0, SPR_CACO, 1,  0, {A_MultiShotDist}, (MT_DUST<<16)|7, -48, S_CACO_WAKE2, 0},
-	{"S_CACO_WAKE2", 0, SPR_CACO, 1, 10, {A_ZThrust}, 4, (1<<16)|1, S_CACO_WAKE3, 0},
-	{"S_CACO_WAKE3", 0, SPR_CACO, 2,  8, {A_ZThrust}, 2, (1<<16)|1, S_CACO_WAKE4, 0},
-	{"S_CACO_WAKE4", 0, SPR_CACO, 2,  4, {A_ZThrust}, 0, (1<<16)|1, S_CACO_ROAR, 0},
-	{"S_CACO_ROAR", 0, SPR_CACO, 2, 10, {A_PlayActiveSound}, 0, 0, S_CACO_CHASE, 0},
-	{"S_CACO_CHASE", 0, SPR_CACO, 2,  5, {A_JetChase}, 0, 0, S_CACO_CHASE_REPEAT, 0},
-	{"S_CACO_CHASE_REPEAT", 0, SPR_CACO, 2,  0, {A_Repeat}, 5, S_CACO_CHASE, S_CACO_RANDOM, 0},
-	{"S_CACO_RANDOM", 0, SPR_CACO, 2,  0, {A_RandomState}, S_CACO_PREPARE_SOUND, S_CACO_CHASE, S_CACO_RANDOM, 0},
-	{"S_CACO_PREPARE_SOUND", 0, SPR_CACO, 2,  8, {A_PlaySound}, sfx_s3k95, 1, S_CACO_PREPARE1, 0},
-	{"S_CACO_PREPARE1", 0, SPR_CACO, 3,               8, {NULL}, 0, 0, S_CACO_PREPARE2, 0},
-	{"S_CACO_PREPARE2", 0, SPR_CACO, 4|FF_FULLBRIGHT, 8, {NULL}, 0, 0, S_CACO_PREPARE3, 0},
-	{"S_CACO_PREPARE3", 0, SPR_CACO, 5|FF_FULLBRIGHT, 8, {NULL}, 0, 0, S_CACO_SHOOT_SOUND, 0},
-	{"S_CACO_SHOOT_SOUND", 0, SPR_CACO, 4|FF_FULLBRIGHT, 0, {A_PlaySound}, sfx_s3k4e, 1, S_CACO_SHOOT1, 0},
-	{"S_CACO_SHOOT1", 0, SPR_CACO, 4|FF_FULLBRIGHT, 0, {A_SpawnParticleRelative}, 0, S_CACOFIRE_EXPLODE1, S_CACO_SHOOT2, 0},
-	{"S_CACO_SHOOT2", 0, SPR_CACO, 4|FF_FULLBRIGHT, 6, {A_FireShot}, MT_CACOFIRE, -24, S_CACO_CLOSE, 0},
-	{"S_CACO_CLOSE", 0, SPR_CACO, 3,              15, {NULL}, 0, 0, S_CACO_CHASE, 0},
-	{"S_CACO_DIE_FLAGS", 0, SPR_CACO, 10, 0, {A_SetObjectFlags}, MF_NOBLOCKMAP, 0, S_CACO_DIE_GIB1, 0},
-	{"S_CACO_DIE_GIB1", 0, SPR_CACO, 10, 0, {A_NapalmScatter}, (7<<16)|MT_CACOSHARD, (30<<16)|20, S_CACO_DIE_GIB2, 0},
-	{"S_CACO_DIE_GIB2", 0, SPR_CACO, 10, 0, {A_NapalmScatter}, (10<<16)|MT_CACOSHARD, (24<<16)|32, S_CACO_DIE_SCREAM, 0},
-	{"S_CACO_DIE_SCREAM", 0, SPR_CACO, 10, 0, {A_Scream}, 0, 0, S_CACO_DIE_SHATTER, 0},
-	{"S_CACO_DIE_SHATTER", 0, SPR_CACO, 10, 0, {A_PlaySound}, sfx_pumpkn, 1, S_CACO_DIE_FALL, 0},
-	{"S_CACO_DIE_FALL", 0, SPR_CACO, 10, 250, {A_FlickySpawn}, (1<<16), 0, S_NULL, 0},
-
-	{"S_CACOSHARD_RANDOMIZE", 0, SPR_CACO, 6, 0, {A_RandomState}, S_CACOSHARD1_1, S_CACOSHARD2_1, S_NULL, 0},
-	{"S_CACOSHARD1_1", 0, SPR_CACO, 6, 3, {NULL}, 0, 0, S_CACOSHARD1_2, 0},
-	{"S_CACOSHARD1_2", 0, SPR_CACO, 7, 3, {NULL}, 0, 0, S_CACOSHARD1_1, 0},
-	{"S_CACOSHARD2_1", 0, SPR_CACO, 8, 3, {NULL}, 0, 0, S_CACOSHARD2_2, 0},
-	{"S_CACOSHARD2_2", 0, SPR_CACO, 9, 3, {NULL}, 0, 0, S_CACOSHARD2_1, 0},
-	{"S_CACOFIRE1", 0, SPR_BAL2,   FF_FULLBRIGHT, 2, {A_GhostMe}, 0, 0, S_CACOFIRE2, 0},
-	{"S_CACOFIRE2", 0, SPR_BAL2, 1|FF_FULLBRIGHT, 2, {A_GhostMe}, 0, 0, S_CACOFIRE3, 0},
-	{"S_CACOFIRE3", 0, SPR_BAL2,   FF_FULLBRIGHT, 0, {A_PlayActiveSound}, 0, 0, S_CACOFIRE1, 0},
-	{"S_CACOFIRE_EXPLODE1", 0, SPR_BAL2, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_CACOFIRE_EXPLODE2, 0},
-	{"S_CACOFIRE_EXPLODE2", 0, SPR_BAL2, 3|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_CACOFIRE_EXPLODE3, 0},
-	{"S_CACOFIRE_EXPLODE3", 0, SPR_BAL2, 4|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_CACOFIRE_EXPLODE4, 0},
-	{"S_CACOFIRE_EXPLODE4", 0, SPR_BAL2, 5|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_SPINBOBERT_MOVE_FLIPUP", 0, SPR_SBOB, 1, 10, {A_ZThrust}, -2, (1<<16)|1, S_SPINBOBERT_MOVE_UP, 0},
-	{"S_SPINBOBERT_MOVE_UP", 0, SPR_SBOB, 0, 45, {A_ZThrust},  4, (1<<16)|1, S_SPINBOBERT_MOVE_FLIPDOWN, 0},
-	{"S_SPINBOBERT_MOVE_FLIPDOWN", 0, SPR_SBOB, 1, 10, {A_ZThrust},  2, (1<<16)|1, S_SPINBOBERT_MOVE_DOWN, 0},
-	{"S_SPINBOBERT_MOVE_DOWN", 0, SPR_SBOB, 2, 45, {A_ZThrust}, -4, (1<<16)|1, S_SPINBOBERT_MOVE_FLIPUP, 0},
-	{"S_SPINBOBERT_FIRE_MOVE", 0, SPR_SBSK, FF_FULLBRIGHT, 1, {A_RotateSpikeBall},       0,                        0, S_SPINBOBERT_FIRE_GHOST, 0},
-	{"S_SPINBOBERT_FIRE_GHOST", 0, SPR_SBSK, FF_FULLBRIGHT, 0, {A_SpawnParticleRelative}, 0, S_SPINBOBERT_FIRE_TRAIL1, S_SPINBOBERT_FIRE_MOVE, 0},
-	{"S_SPINBOBERT_FIRE_TRAIL1", 0, SPR_SBFL, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SPINBOBERT_FIRE_TRAIL2, 0},
-	{"S_SPINBOBERT_FIRE_TRAIL2", 0, SPR_SBFL, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SPINBOBERT_FIRE_TRAIL3, 0},
-	{"S_SPINBOBERT_FIRE_TRAIL3", 0, SPR_SBFL,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_HANGSTER_LOOK", 0, SPR_HBAT, 0,  5, {A_Look}, (900<<16)|1, 0, S_HANGSTER_LOOK, 0},
-	{"S_HANGSTER_SWOOP1", 0, SPR_HBAT, 1,  0, {A_MultiShotDist}, (MT_DUST<<16)|10, -34, S_HANGSTER_SWOOP2, 0},
-	{"S_HANGSTER_SWOOP2", 0, SPR_HBAT, 1,  2, {A_ZThrust}, -8, (1<<16)|1, S_HANGSTER_SWOOP2, 0},
-	{"S_HANGSTER_ARC1", 0, SPR_HBAT, 1,  6, {A_ZThrust}, -5, (1<<16), S_HANGSTER_ARC2, 0},
-	{"S_HANGSTER_ARC2", 0, SPR_HBAT, 1,  5, {A_ZThrust}, -2, (1<<16), S_HANGSTER_ARC3, 0},
-	{"S_HANGSTER_ARC3", 0, SPR_HBAT, 1,  1, {A_ZThrust},  0, (1<<16), S_HANGSTER_FLY1, 0},
-	{"S_HANGSTER_FLY1", 0, SPR_HBAT, 1,  4, {A_Thrust}, 6, 1, S_HANGSTER_FLY2, 0},
-	{"S_HANGSTER_FLY2", 0, SPR_HBAT, 2,  1, {A_PlaySound}, sfx_s3k52, 1, S_HANGSTER_FLY3, 0},
-	{"S_HANGSTER_FLY3", 0, SPR_HBAT, 3,  4, {A_Thrust}, 6, 1, S_HANGSTER_FLY4, 0},
-	{"S_HANGSTER_FLY4", 0, SPR_HBAT, 2,  1, {A_Thrust}, 6, 1, S_HANGSTER_FLYREPEAT, 0},
-	{"S_HANGSTER_FLYREPEAT", 0, SPR_HBAT, 2,  0, {A_Repeat}, 12, S_HANGSTER_FLY1, S_HANGSTER_ARCUP1, 0},
-	{"S_HANGSTER_ARCUP1", 0, SPR_HBAT, 1,  5, {A_ZThrust},  2, (1<<16), S_HANGSTER_ARCUP2, 0},
-	{"S_HANGSTER_ARCUP2", 0, SPR_HBAT, 1,  6, {A_ZThrust},  5, (1<<16), S_HANGSTER_ARCUP3, 0},
-	{"S_HANGSTER_ARCUP3", 0, SPR_HBAT, 1,  1, {A_ZThrust},  0, (1<<16), S_HANGSTER_RETURN1, 0},
-	{"S_HANGSTER_RETURN1", 0, SPR_HBAT, 1,  1, {A_ZThrust},  8, (1<<16), S_HANGSTER_RETURN2, 0},
-	{"S_HANGSTER_RETURN2", 0, SPR_HBAT, 3,  1, {NULL}, 0, 0, S_HANGSTER_RETURN1, 0},
-	{"S_HANGSTER_RETURN3", 0, SPR_HBAT, 0, 15, {NULL}, 0, 0, S_HANGSTER_LOOK, 0},
-
-	{"S_CRUMBLE1", 0, SPR_NULL, 0,  35, {NULL}, 0, 0, S_CRUMBLE2, 0},
-	{"S_CRUMBLE2", 0, SPR_NULL, 0, 105, {A_Scream}, 0, 0, S_NULL, 0},
+	{"PENGUINATOR_LOOK", 0, SPR_PENG, 0, 2, {A_Look},  0, 0, S_PENGUINATOR_LOOK, 0},
+	{"PENGUINATOR_WADDLE1", 0, SPR_PENG, 0, 2, {A_Chase}, 0, 0, S_PENGUINATOR_WADDLE2, 0},
+	{"PENGUINATOR_WADDLE2", 0, SPR_PENG, 1, 2, {A_Chase}, 0, 0, S_PENGUINATOR_WADDLE3, 0},
+	{"PENGUINATOR_WADDLE3", 0, SPR_PENG, 0, 2, {A_Chase}, 0, 0, S_PENGUINATOR_WADDLE4, 0},
+	{"PENGUINATOR_WADDLE4", 0, SPR_PENG, 2, 2, {A_Chase}, 0, 0, S_PENGUINATOR_WADDLE1, 0},
+	{"PENGUINATOR_SLIDE1", 0, SPR_PENG, 0,  0, {A_FaceTarget},      0,  0, S_PENGUINATOR_SLIDE2, 0},
+	{"PENGUINATOR_SLIDE2", 0, SPR_PENG, 3,  5, {A_BunnyHop},        4, 10, S_PENGUINATOR_SLIDE3, 0},
+	{"PENGUINATOR_SLIDE3", 0, SPR_PENG, 4, 90, {A_PlayAttackSound}, 0,  0, S_PENGUINATOR_SLIDE4, 0},
+	{"PENGUINATOR_SLIDE4", 0, SPR_PENG, 3,  5, {A_Thrust},          0,  1, S_PENGUINATOR_SLIDE5, 0},
+	{"PENGUINATOR_SLIDE5", 0, SPR_PENG, 0,  5, {A_FaceTarget},      0,  0, S_PENGUINATOR_LOOK, 0},
+
+	{"POPHAT_LOOK", 0, SPR_POPH, 0,  2, {A_Look},  (2048<<16)|1,           0, S_POPHAT_LOOK, 0},
+	{"POPHAT_SHOOT1", 0, SPR_POPH, 1,  0, {A_MultiShotDist}, (MT_SPINDUST<<16)|4, 24, S_POPHAT_SHOOT2, 0},
+	{"POPHAT_SHOOT2", 0, SPR_POPH, 1,  2, {A_LobShot}, MT_POPSHOT, (70<<16)|60, S_POPHAT_SHOOT3, 0},
+	{"POPHAT_SHOOT3", 0, SPR_POPH, 2,  1, {NULL},               0,           0, S_POPHAT_SHOOT4, 0},
+	{"POPHAT_SHOOT4", 0, SPR_POPH, 0, 57, {NULL},               0,           0, S_POPHAT_LOOK, 0},
+	{"POPSHOT", 0, SPR_POPH, 3,  3, {A_SpawnObjectRelative}, 0, MT_POPSHOT_TRAIL, S_POPSHOT, 0},
+	{"POPSHOT_TRAIL", 0, SPR_NULL, 0,  2, {NULL},                  0, 0,                S_SPINDUST1, 0},
+
+	{"HIVEELEMENTAL_LOOK", 0, SPR_HIVE, 0,  5, {A_Look}, 1, 1, S_HIVEELEMENTAL_LOOK, 0},
+	{"HIVEELEMENTAL_PREPARE1", 0, SPR_HIVE, 0, 14, {A_PlaySound}, sfx_s3k76, 1, S_HIVEELEMENTAL_PREPARE2, 0},
+	{"HIVEELEMENTAL_PREPARE2", 0, SPR_HIVE, 0,  6, {A_PlaySound}, sfx_s3k8c, 1, S_HIVEELEMENTAL_SHOOT1, 0},
+	{"HIVEELEMENTAL_SHOOT1", 0, SPR_HIVE, 1,  4, {A_WhoCaresIfYourSonIsABee}, (MT_BUMBLEBORE<<16)|4, (1<<16)|32, S_HIVEELEMENTAL_SHOOT2, 0},
+	{"HIVEELEMENTAL_SHOOT2", 0, SPR_HIVE, 2,  2, {NULL}, 0, 0, S_HIVEELEMENTAL_DORMANT, 0},
+	{"HIVEELEMENTAL_DORMANT", 0, SPR_HIVE, 0,  5, {A_ParentTriesToSleep}, S_HIVEELEMENTAL_PREPARE1, 0, S_HIVEELEMENTAL_DORMANT, 0},
+	{"HIVEELEMENTAL_PAIN", 0, SPR_HIVE, 3, 35, {A_Pain}, 0, 0, S_HIVEELEMENTAL_LOOK, 0},
+	{"HIVEELEMENTAL_DIE1", 0, SPR_HIVE, 3,  2, {A_BossScream}, 1, 0, S_HIVEELEMENTAL_DIE2, 0},
+	{"HIVEELEMENTAL_DIE2", 0, SPR_NULL, 0,  2, {A_BossScream}, 1, 0, S_HIVEELEMENTAL_DIE3, 0},
+	{"HIVEELEMENTAL_DIE3", 0, SPR_NULL, 0,  0, {A_Repeat}, 7, S_HIVEELEMENTAL_DIE1, S_XPLD_FLICKY, 0},
+
+	{"BUMBLEBORE_SPAWN", 0, SPR_BUMB, 1, 10, {NULL}, 0, 0, S_BUMBLEBORE_LOOK1, 0},
+	{"BUMBLEBORE_LOOK1", 0, SPR_BUMB, 0,  4, {A_Look}, 1, 1, S_BUMBLEBORE_LOOK2, 0},
+	{"BUMBLEBORE_LOOK2", 0, SPR_BUMB, 1,  4, {A_Look}, 1, 1, S_BUMBLEBORE_LOOK1, 0},
+	{"BUMBLEBORE_FLY1", 0, SPR_BUMB, 0,  4, {A_JetbThink}, 0, 0, S_BUMBLEBORE_FLY2, 0},
+	{"BUMBLEBORE_FLY2", 0, SPR_BUMB, 1,  4, {A_JetbThink}, 0, 0, S_BUMBLEBORE_FLY1, 0},
+	{"BUMBLEBORE_RAISE", 0, SPR_BUMB, 2|FF_FULLBRIGHT,  12, {A_ZThrust},  4, (1<<16)|1, S_BUMBLEBORE_FALL1, 0},
+	{"BUMBLEBORE_FALL1", 0, SPR_BUMB, 2|FF_FULLBRIGHT,   0, {A_ZThrust}, -8, (1<<16)|1, S_BUMBLEBORE_FALL2, 0},
+	{"BUMBLEBORE_FALL2", 0, SPR_BUMB, 2|FF_FULLBRIGHT, 300, {NULL},       0,         0, S_BUMBLEBORE_DIE, 0},
+	{"BUMBLEBORE_STUCK1", 0, SPR_BUMB, 4, 3, {A_MultiShotDist}, (MT_DUST<<16)|6, -40, S_BUMBLEBORE_STUCK2, 0},
+	{"BUMBLEBORE_STUCK2", 0, SPR_BUMB, 5, 120, {NULL}, 0, 0, S_BUMBLEBORE_DIE, 0},
+	{"BUMBLEBORE_DIE", 0, SPR_BUMB, 5, 0, {A_CryingToMomma}, 0, 0, S_XPLD1, 0},
+
+	{"BUGGLEIDLE", 0, SPR_BBUZ,          0, -1, {NULL}, 0, 0, S_NULL, 0},
+	{"BUGGLEFLY", 0, SPR_BBUZ, FF_ANIMATE, -1, {NULL}, 1, 2, S_NULL, 0},
+
+	{"SMASHSPIKE_FLOAT", 0, SPR_FMCE, 0, 20, {NULL}, 0, 0, S_SMASHSPIKE_EASE1, 0},
+	{"SMASHSPIKE_EASE1", 0, SPR_FMCE, 0,  4, {A_ZThrust},  4, (1<<16)|1, S_SMASHSPIKE_EASE2, 0},
+	{"SMASHSPIKE_EASE2", 0, SPR_FMCE, 0,  4, {A_ZThrust},  0, (1<<16)|1, S_SMASHSPIKE_FALL, 0},
+	{"SMASHSPIKE_FALL", 0, SPR_FMCE, 0,  2, {A_ZThrust}, -6,         1, S_SMASHSPIKE_FALL, 0},
+	{"SMASHSPIKE_STOMP1", 0, SPR_FMCE, 1,  2, {A_MultiShotDist}, (MT_DUST<<16)|10, -48, S_SMASHSPIKE_STOMP2, 0},
+	{"SMASHSPIKE_STOMP2", 0, SPR_FMCE, 2, 14, {NULL}, 0, 0, S_SMASHSPIKE_RISE1, 0},
+	{"SMASHSPIKE_RISE1", 0, SPR_FMCE, 1,  2, {NULL}, 0, 0, S_SMASHSPIKE_RISE2, 0},
+	{"SMASHSPIKE_RISE2", 0, SPR_FMCE, 0,  2, {A_ZThrust}, 6, (1<<16)|1, S_SMASHSPIKE_RISE2, 0},
+
+	{"CACO_LOOK", 0, SPR_CACO, 0,  5, {A_Look}, (1100<<16)|1, 0, S_CACO_LOOK, 0},
+	{"CACO_WAKE1", 0, SPR_CACO, 1,  0, {A_MultiShotDist}, (MT_DUST<<16)|7, -48, S_CACO_WAKE2, 0},
+	{"CACO_WAKE2", 0, SPR_CACO, 1, 10, {A_ZThrust}, 4, (1<<16)|1, S_CACO_WAKE3, 0},
+	{"CACO_WAKE3", 0, SPR_CACO, 2,  8, {A_ZThrust}, 2, (1<<16)|1, S_CACO_WAKE4, 0},
+	{"CACO_WAKE4", 0, SPR_CACO, 2,  4, {A_ZThrust}, 0, (1<<16)|1, S_CACO_ROAR, 0},
+	{"CACO_ROAR", 0, SPR_CACO, 2, 10, {A_PlayActiveSound}, 0, 0, S_CACO_CHASE, 0},
+	{"CACO_CHASE", 0, SPR_CACO, 2,  5, {A_JetChase}, 0, 0, S_CACO_CHASE_REPEAT, 0},
+	{"CACO_CHASE_REPEAT", 0, SPR_CACO, 2,  0, {A_Repeat}, 5, S_CACO_CHASE, S_CACO_RANDOM, 0},
+	{"CACO_RANDOM", 0, SPR_CACO, 2,  0, {A_RandomState}, S_CACO_PREPARE_SOUND, S_CACO_CHASE, S_CACO_RANDOM, 0},
+	{"CACO_PREPARE_SOUND", 0, SPR_CACO, 2,  8, {A_PlaySound}, sfx_s3k95, 1, S_CACO_PREPARE1, 0},
+	{"CACO_PREPARE1", 0, SPR_CACO, 3,               8, {NULL}, 0, 0, S_CACO_PREPARE2, 0},
+	{"CACO_PREPARE2", 0, SPR_CACO, 4|FF_FULLBRIGHT, 8, {NULL}, 0, 0, S_CACO_PREPARE3, 0},
+	{"CACO_PREPARE3", 0, SPR_CACO, 5|FF_FULLBRIGHT, 8, {NULL}, 0, 0, S_CACO_SHOOT_SOUND, 0},
+	{"CACO_SHOOT_SOUND", 0, SPR_CACO, 4|FF_FULLBRIGHT, 0, {A_PlaySound}, sfx_s3k4e, 1, S_CACO_SHOOT1, 0},
+	{"CACO_SHOOT1", 0, SPR_CACO, 4|FF_FULLBRIGHT, 0, {A_SpawnParticleRelative}, 0, S_CACOFIRE_EXPLODE1, S_CACO_SHOOT2, 0},
+	{"CACO_SHOOT2", 0, SPR_CACO, 4|FF_FULLBRIGHT, 6, {A_FireShot}, MT_CACOFIRE, -24, S_CACO_CLOSE, 0},
+	{"CACO_CLOSE", 0, SPR_CACO, 3,              15, {NULL}, 0, 0, S_CACO_CHASE, 0},
+	{"CACO_DIE_FLAGS", 0, SPR_CACO, 10, 0, {A_SetObjectFlags}, MF_NOBLOCKMAP, 0, S_CACO_DIE_GIB1, 0},
+	{"CACO_DIE_GIB1", 0, SPR_CACO, 10, 0, {A_NapalmScatter}, (7<<16)|MT_CACOSHARD, (30<<16)|20, S_CACO_DIE_GIB2, 0},
+	{"CACO_DIE_GIB2", 0, SPR_CACO, 10, 0, {A_NapalmScatter}, (10<<16)|MT_CACOSHARD, (24<<16)|32, S_CACO_DIE_SCREAM, 0},
+	{"CACO_DIE_SCREAM", 0, SPR_CACO, 10, 0, {A_Scream}, 0, 0, S_CACO_DIE_SHATTER, 0},
+	{"CACO_DIE_SHATTER", 0, SPR_CACO, 10, 0, {A_PlaySound}, sfx_pumpkn, 1, S_CACO_DIE_FALL, 0},
+	{"CACO_DIE_FALL", 0, SPR_CACO, 10, 250, {A_FlickySpawn}, (1<<16), 0, S_NULL, 0},
+
+	{"CACOSHARD_RANDOMIZE", 0, SPR_CACO, 6, 0, {A_RandomState}, S_CACOSHARD1_1, S_CACOSHARD2_1, S_NULL, 0},
+	{"CACOSHARD1_1", 0, SPR_CACO, 6, 3, {NULL}, 0, 0, S_CACOSHARD1_2, 0},
+	{"CACOSHARD1_2", 0, SPR_CACO, 7, 3, {NULL}, 0, 0, S_CACOSHARD1_1, 0},
+	{"CACOSHARD2_1", 0, SPR_CACO, 8, 3, {NULL}, 0, 0, S_CACOSHARD2_2, 0},
+	{"CACOSHARD2_2", 0, SPR_CACO, 9, 3, {NULL}, 0, 0, S_CACOSHARD2_1, 0},
+	{"CACOFIRE1", 0, SPR_BAL2,   FF_FULLBRIGHT, 2, {A_GhostMe}, 0, 0, S_CACOFIRE2, 0},
+	{"CACOFIRE2", 0, SPR_BAL2, 1|FF_FULLBRIGHT, 2, {A_GhostMe}, 0, 0, S_CACOFIRE3, 0},
+	{"CACOFIRE3", 0, SPR_BAL2,   FF_FULLBRIGHT, 0, {A_PlayActiveSound}, 0, 0, S_CACOFIRE1, 0},
+	{"CACOFIRE_EXPLODE1", 0, SPR_BAL2, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_CACOFIRE_EXPLODE2, 0},
+	{"CACOFIRE_EXPLODE2", 0, SPR_BAL2, 3|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_CACOFIRE_EXPLODE3, 0},
+	{"CACOFIRE_EXPLODE3", 0, SPR_BAL2, 4|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_CACOFIRE_EXPLODE4, 0},
+	{"CACOFIRE_EXPLODE4", 0, SPR_BAL2, 5|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
+
+	{"SPINBOBERT_MOVE_FLIPUP", 0, SPR_SBOB, 1, 10, {A_ZThrust}, -2, (1<<16)|1, S_SPINBOBERT_MOVE_UP, 0},
+	{"SPINBOBERT_MOVE_UP", 0, SPR_SBOB, 0, 45, {A_ZThrust},  4, (1<<16)|1, S_SPINBOBERT_MOVE_FLIPDOWN, 0},
+	{"SPINBOBERT_MOVE_FLIPDOWN", 0, SPR_SBOB, 1, 10, {A_ZThrust},  2, (1<<16)|1, S_SPINBOBERT_MOVE_DOWN, 0},
+	{"SPINBOBERT_MOVE_DOWN", 0, SPR_SBOB, 2, 45, {A_ZThrust}, -4, (1<<16)|1, S_SPINBOBERT_MOVE_FLIPUP, 0},
+	{"SPINBOBERT_FIRE_MOVE", 0, SPR_SBSK, FF_FULLBRIGHT, 1, {A_RotateSpikeBall},       0,                        0, S_SPINBOBERT_FIRE_GHOST, 0},
+	{"SPINBOBERT_FIRE_GHOST", 0, SPR_SBSK, FF_FULLBRIGHT, 0, {A_SpawnParticleRelative}, 0, S_SPINBOBERT_FIRE_TRAIL1, S_SPINBOBERT_FIRE_MOVE, 0},
+	{"SPINBOBERT_FIRE_TRAIL1", 0, SPR_SBFL, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SPINBOBERT_FIRE_TRAIL2, 0},
+	{"SPINBOBERT_FIRE_TRAIL2", 0, SPR_SBFL, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SPINBOBERT_FIRE_TRAIL3, 0},
+	{"SPINBOBERT_FIRE_TRAIL3", 0, SPR_SBFL,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL, 0},
+
+	{"HANGSTER_LOOK", 0, SPR_HBAT, 0,  5, {A_Look}, (900<<16)|1, 0, S_HANGSTER_LOOK, 0},
+	{"HANGSTER_SWOOP1", 0, SPR_HBAT, 1,  0, {A_MultiShotDist}, (MT_DUST<<16)|10, -34, S_HANGSTER_SWOOP2, 0},
+	{"HANGSTER_SWOOP2", 0, SPR_HBAT, 1,  2, {A_ZThrust}, -8, (1<<16)|1, S_HANGSTER_SWOOP2, 0},
+	{"HANGSTER_ARC1", 0, SPR_HBAT, 1,  6, {A_ZThrust}, -5, (1<<16), S_HANGSTER_ARC2, 0},
+	{"HANGSTER_ARC2", 0, SPR_HBAT, 1,  5, {A_ZThrust}, -2, (1<<16), S_HANGSTER_ARC3, 0},
+	{"HANGSTER_ARC3", 0, SPR_HBAT, 1,  1, {A_ZThrust},  0, (1<<16), S_HANGSTER_FLY1, 0},
+	{"HANGSTER_FLY1", 0, SPR_HBAT, 1,  4, {A_Thrust}, 6, 1, S_HANGSTER_FLY2, 0},
+	{"HANGSTER_FLY2", 0, SPR_HBAT, 2,  1, {A_PlaySound}, sfx_s3k52, 1, S_HANGSTER_FLY3, 0},
+	{"HANGSTER_FLY3", 0, SPR_HBAT, 3,  4, {A_Thrust}, 6, 1, S_HANGSTER_FLY4, 0},
+	{"HANGSTER_FLY4", 0, SPR_HBAT, 2,  1, {A_Thrust}, 6, 1, S_HANGSTER_FLYREPEAT, 0},
+	{"HANGSTER_FLYREPEAT", 0, SPR_HBAT, 2,  0, {A_Repeat}, 12, S_HANGSTER_FLY1, S_HANGSTER_ARCUP1, 0},
+	{"HANGSTER_ARCUP1", 0, SPR_HBAT, 1,  5, {A_ZThrust},  2, (1<<16), S_HANGSTER_ARCUP2, 0},
+	{"HANGSTER_ARCUP2", 0, SPR_HBAT, 1,  6, {A_ZThrust},  5, (1<<16), S_HANGSTER_ARCUP3, 0},
+	{"HANGSTER_ARCUP3", 0, SPR_HBAT, 1,  1, {A_ZThrust},  0, (1<<16), S_HANGSTER_RETURN1, 0},
+	{"HANGSTER_RETURN1", 0, SPR_HBAT, 1,  1, {A_ZThrust},  8, (1<<16), S_HANGSTER_RETURN2, 0},
+	{"HANGSTER_RETURN2", 0, SPR_HBAT, 3,  1, {NULL}, 0, 0, S_HANGSTER_RETURN1, 0},
+	{"HANGSTER_RETURN3", 0, SPR_HBAT, 0, 15, {NULL}, 0, 0, S_HANGSTER_LOOK, 0},
+
+	{"CRUMBLE1", 0, SPR_NULL, 0,  35, {NULL}, 0, 0, S_CRUMBLE2, 0},
+	{"CRUMBLE2", 0, SPR_NULL, 0, 105, {A_Scream}, 0, 0, S_NULL, 0},
 
 	// Spark
-	{"S_SPRK1", 0, SPR_NULL, 0, 1, {A_ModuloToState}, 2, S_SPRK2, S_SPRK3, 0},
-	{"S_SPRK2", 0, SPR_SPRK, FF_TRANS20|FF_ANIMATE|0, 18, {NULL}, 8, 2, S_NULL, 0},
-	{"S_SPRK3", 0, SPR_SPRK, FF_TRANS20|FF_ANIMATE|9, 18, {NULL}, 8, 2, S_NULL, 0},
+	{"SPRK1", 0, SPR_NULL, 0, 1, {A_ModuloToState}, 2, S_SPRK2, S_SPRK3, 0},
+	{"SPRK2", 0, SPR_SPRK, FF_TRANS20|FF_ANIMATE|0, 18, {NULL}, 8, 2, S_NULL, 0},
+	{"SPRK3", 0, SPR_SPRK, FF_TRANS20|FF_ANIMATE|9, 18, {NULL}, 8, 2, S_NULL, 0},
 
 	// Robot Explosion
-	{"S_XPLD_FLICKY", 0, SPR_BOM1, 0, 0, {A_FlickySpawn},  0, 0, S_XPLD1, 0},
-	{"S_XPLD1", 0, SPR_BOM1, 0, 2, {A_ShadowScream}, 0, 0, S_XPLD2, 0},
-	{"S_XPLD2", 0, SPR_BOM1, 1, 2, {NULL},           0, 0, S_XPLD3, 0},
-	{"S_XPLD3", 0, SPR_BOM1, 2, 3, {NULL},           0, 0, S_XPLD4, 0},
-	{"S_XPLD4", 0, SPR_BOM1, 3, 3, {NULL},           0, 0, S_XPLD5, 0},
-	{"S_XPLD5", 0, SPR_BOM1, 4, 4, {NULL},           0, 0, S_XPLD6, 0},
-	{"S_XPLD6", 0, SPR_BOM1, 5, 4, {NULL},           0, 0, S_NULL, 0},
+	{"XPLD_FLICKY", 0, SPR_BOM1, 0, 0, {A_FlickySpawn},  0, 0, S_XPLD1, 0},
+	{"XPLD1", 0, SPR_BOM1, 0, 2, {A_ShadowScream}, 0, 0, S_XPLD2, 0},
+	{"XPLD2", 0, SPR_BOM1, 1, 2, {NULL},           0, 0, S_XPLD3, 0},
+	{"XPLD3", 0, SPR_BOM1, 2, 3, {NULL},           0, 0, S_XPLD4, 0},
+	{"XPLD4", 0, SPR_BOM1, 3, 3, {NULL},           0, 0, S_XPLD5, 0},
+	{"XPLD5", 0, SPR_BOM1, 4, 4, {NULL},           0, 0, S_XPLD6, 0},
+	{"XPLD6", 0, SPR_BOM1, 5, 4, {NULL},           0, 0, S_NULL, 0},
 
-	{"S_XPLD_EGGTRAP", 0, SPR_BOM1, FF_ANIMATE,   21, {NULL},          5, 4, S_INVISIBLE, 0},
+	{"XPLD_EGGTRAP", 0, SPR_BOM1, FF_ANIMATE,   21, {NULL},          5, 4, S_INVISIBLE, 0},
 
 	// Underwater Explosion
-	{"S_WPLD1", 0, SPR_BOM4, 0, 3, {A_ShadowScream}, 0, 0, S_WPLD2, 0},
-	{"S_WPLD2", 0, SPR_BOM4, 1, 3, {NULL},           0, 0, S_WPLD3, 0},
-	{"S_WPLD3", 0, SPR_BOM4, 2, 3, {NULL},           0, 0, S_WPLD4, 0},
-	{"S_WPLD4", 0, SPR_BOM4, 3, 3, {NULL},           0, 0, S_WPLD5, 0},
-	{"S_WPLD5", 0, SPR_BOM4, 4, 3, {NULL},           0, 0, S_WPLD6, 0},
-	{"S_WPLD6", 0, SPR_BOM4, 5, 3, {NULL},           0, 0, S_NULL, 0},
-
-	{"S_DUST1", 0, SPR_DUST,   FF_TRANS40, 4, {NULL}, 0, 0, S_DUST2, 0},
-	{"S_DUST2", 0, SPR_DUST, 1|FF_TRANS50, 5, {NULL}, 0, 0, S_DUST3, 0},
-	{"S_DUST3", 0, SPR_DUST, 2|FF_TRANS60, 3, {NULL}, 0, 0, S_DUST4, 0},
-	{"S_DUST4", 0, SPR_DUST, 3|FF_TRANS70, 2, {NULL}, 0, 0, S_NULL, 0},
-
-	{"S_ROCKSPAWN", 0, SPR_NULL, 0, 1, {A_RockSpawn}, 0, 0, S_ROCKSPAWN, 0},
-
-	{"S_ROCKCRUMBLEA", 0, SPR_ROIA, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEB", 0, SPR_ROIB, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEC", 0, SPR_ROIC, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLED", 0, SPR_ROID, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEE", 0, SPR_ROIE, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEF", 0, SPR_ROIF, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEG", 0, SPR_ROIG, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEH", 0, SPR_ROIH, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEI", 0, SPR_ROII, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEJ", 0, SPR_ROIJ, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEK", 0, SPR_ROIK, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEL", 0, SPR_ROIL, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEM", 0, SPR_ROIM, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEN", 0, SPR_ROIN, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEO", 0, SPR_ROIO, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
-	{"S_ROCKCRUMBLEP", 0, SPR_ROIP, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
-
-	{"S_GFZDEBRIS", 0, SPR_GFZD, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL, 0},
-	{"S_BRICKDEBRIS", 0, SPR_BRIC, FF_ANIMATE, -1, {A_DebrisRandom}, 7, 2, S_NULL, 0},
-	{"S_WOODDEBRIS", 0, SPR_WDDB, FF_ANIMATE, -1, {A_DebrisRandom}, 7, 2, S_NULL, 0},
-	{"S_REDBRICKDEBRIS", 0, SPR_BRIR, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL, 0},
-	{"S_BLUEBRICKDEBRIS", 0, SPR_BRIB, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL, 0},
-	{"S_YELLOWBRICKDEBRIS", 0, SPR_BRIY, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL, 0},
-
-	{"S_NAMECHECK", 0, SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL, 0},
+	{"WPLD1", 0, SPR_BOM4, 0, 3, {A_ShadowScream}, 0, 0, S_WPLD2, 0},
+	{"WPLD2", 0, SPR_BOM4, 1, 3, {NULL},           0, 0, S_WPLD3, 0},
+	{"WPLD3", 0, SPR_BOM4, 2, 3, {NULL},           0, 0, S_WPLD4, 0},
+	{"WPLD4", 0, SPR_BOM4, 3, 3, {NULL},           0, 0, S_WPLD5, 0},
+	{"WPLD5", 0, SPR_BOM4, 4, 3, {NULL},           0, 0, S_WPLD6, 0},
+	{"WPLD6", 0, SPR_BOM4, 5, 3, {NULL},           0, 0, S_NULL, 0},
+
+	{"DUST1", 0, SPR_DUST,   FF_TRANS40, 4, {NULL}, 0, 0, S_DUST2, 0},
+	{"DUST2", 0, SPR_DUST, 1|FF_TRANS50, 5, {NULL}, 0, 0, S_DUST3, 0},
+	{"DUST3", 0, SPR_DUST, 2|FF_TRANS60, 3, {NULL}, 0, 0, S_DUST4, 0},
+	{"DUST4", 0, SPR_DUST, 3|FF_TRANS70, 2, {NULL}, 0, 0, S_NULL, 0},
+
+	{"ROCKSPAWN", 0, SPR_NULL, 0, 1, {A_RockSpawn}, 0, 0, S_ROCKSPAWN, 0},
+
+	{"ROCKCRUMBLEA", 0, SPR_ROIA, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL, 0},
+	{"ROCKCRUMBLEB", 0, SPR_ROIB, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
+	{"ROCKCRUMBLEC", 0, SPR_ROIC, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
+	{"ROCKCRUMBLED", 0, SPR_ROID, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
+	{"ROCKCRUMBLEE", 0, SPR_ROIE, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
+	{"ROCKCRUMBLEF", 0, SPR_ROIF, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
+	{"ROCKCRUMBLEG", 0, SPR_ROIG, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL, 0},
+	{"ROCKCRUMBLEH", 0, SPR_ROIH, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL, 0},
+	{"ROCKCRUMBLEI", 0, SPR_ROII, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
+	{"ROCKCRUMBLEJ", 0, SPR_ROIJ, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL, 0},
+	{"ROCKCRUMBLEK", 0, SPR_ROIK, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 4, 2, S_NULL, 0},
+	{"ROCKCRUMBLEL", 0, SPR_ROIL, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
+	{"ROCKCRUMBLEM", 0, SPR_ROIM, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
+	{"ROCKCRUMBLEN", 0, SPR_ROIN, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
+	{"ROCKCRUMBLEO", 0, SPR_ROIO, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
+	{"ROCKCRUMBLEP", 0, SPR_ROIP, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 2, S_NULL, 0},
+
+	{"GFZDEBRIS", 0, SPR_GFZD, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL, 0},
+	{"BRICKDEBRIS", 0, SPR_BRIC, FF_ANIMATE, -1, {A_DebrisRandom}, 7, 2, S_NULL, 0},
+	{"WOODDEBRIS", 0, SPR_WDDB, FF_ANIMATE, -1, {A_DebrisRandom}, 7, 2, S_NULL, 0},
+	{"REDBRICKDEBRIS", 0, SPR_BRIR, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL, 0},
+	{"BLUEBRICKDEBRIS", 0, SPR_BRIB, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL, 0},
+	{"YELLOWBRICKDEBRIS", 0, SPR_BRIY, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL, 0},
+
+	{"NAMECHECK", 0, SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL, 0},
 };
 
 state_t **states;
@@ -3931,7 +3931,7 @@ UINT32 numstates;
 static const mobjinfo_t startmobjinfo[] =
 {
 	{
-		"MT_NULL",
+		"NULL",
 		-1,             // doomednum
 		S_NULL,         // spawnstate
 		0,              // spawnhealth
@@ -3959,7 +3959,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_UNKNOWN",
+		"UNKNOWN",
 		-1,             // doomednum
 		S_UNKNOWN,      // spawnstate
 		1,              // spawnhealth
@@ -3987,7 +3987,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THOK",
+		"THOK",
 		-1,             // doomednum
 		S_THOK,         // spawnstate
 		1000,           // spawnhealth
@@ -4015,7 +4015,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PLAYER",
+		"PLAYER",
 		-1,             // doomednum
 		S_PLAY_STND,    // spawnstate
 		1,              // spawnhealth
@@ -4043,7 +4043,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TAILSOVERLAY",
+		"TAILSOVERLAY",
 		-1,             // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -4071,7 +4071,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_METALJETFUME",
+		"METALJETFUME",
 		-1,             // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -4099,7 +4099,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUECRAWLA",
+		"BLUECRAWLA",
 		100,            // doomednum
 		S_POSS_STND,    // spawnstate
 		1,              // spawnhealth
@@ -4127,7 +4127,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_REDCRAWLA",
+		"REDCRAWLA",
 		101,            // doomednum
 		S_SPOS_STND,    // spawnstate
 		1,              // spawnhealth
@@ -4155,7 +4155,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GFZFISH",
+		"GFZFISH",
 		102,            // doomednum
 		S_FISH2,        // spawnstate
 		1,              // spawnhealth
@@ -4183,7 +4183,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GOLDBUZZ",
+		"GOLDBUZZ",
 		103,            // doomednum
 		S_BUZZLOOK1,    // spawnstate
 		1,              // spawnhealth
@@ -4211,7 +4211,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_REDBUZZ",
+		"REDBUZZ",
 		104,            // doomednum
 		S_RBUZZLOOK1,   // spawnstate
 		1,              // spawnhealth
@@ -4239,7 +4239,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_JETTBOMBER",
+		"JETTBOMBER",
 		105,            // doomednum
 		S_JETBLOOK1,    // spawnstate
 		1,              // spawnhealth
@@ -4267,7 +4267,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_JETTGUNNER",
+		"JETTGUNNER",
 		106,            // doomednum
 		S_JETGLOOK1,    // spawnstate
 		1,              // spawnhealth
@@ -4295,7 +4295,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CRAWLACOMMANDER",
+		"CRAWLACOMMANDER",
 		107,            // doomednum
 		S_CCOMMAND1,    // spawnstate
 		2,              // spawnhealth
@@ -4323,7 +4323,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DETON",
+		"DETON",
 		108,            // doomednum
 		S_DETON1,       // spawnstate
 		1,              // spawnhealth
@@ -4351,7 +4351,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SKIM",
+		"SKIM",
 		109,            // doomednum
 		S_SKIM1,        // spawnstate
 		1,              // spawnhealth
@@ -4379,7 +4379,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TURRET",
+		"TURRET",
 		110,            // doomednum
 		S_TURRET,       // spawnstate
 		1000,           // spawnhealth
@@ -4407,7 +4407,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_POPUPTURRET",
+		"POPUPTURRET",
 		111,            // doomednum
 		S_TURRETLOOK,   // spawnstate
 		1,              // spawnhealth
@@ -4435,7 +4435,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPINCUSHION",
+		"SPINCUSHION",
 		112,            // doomednum
 		S_SPINCUSHION_LOOK, // spawnstate
 		1,              // spawnhealth
@@ -4463,7 +4463,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CRUSHSTACEAN",
+		"CRUSHSTACEAN",
 		126,            // doomednum
 		S_CRUSHSTACEAN_ROAM1, // spawnstate
 		1,              // spawnhealth
@@ -4491,7 +4491,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CRUSHCLAW",
+		"CRUSHCLAW",
 		-1,             // doomednum
 		S_CRUSHCLAW_AIM, // spawnstate
 		1,              // spawnhealth
@@ -4519,7 +4519,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CRUSHCHAIN",
+		"CRUSHCHAIN",
 		-1,             // doomednum
 		S_CRUSHCHAIN,   // spawnstate
 		0,              // spawnhealth
@@ -4547,7 +4547,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BANPYURA",
+		"BANPYURA",
 		138,            // doomednum
 		S_BANPYURA_ROAM1, // spawnstate
 		1,              // spawnhealth
@@ -4575,7 +4575,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BANPSPRING",
+		"BANPSPRING",
 		-1,             // doomednum
 		S_CDIAG1,       // spawnstate
 		1,              // spawnhealth
@@ -4603,7 +4603,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_JETJAW",
+		"JETJAW",
 		113,            // doomednum
 		S_JETJAW_ROAM1, // spawnstate
 		1,              // spawnhealth
@@ -4631,7 +4631,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SNAILER",
+		"SNAILER",
 		114,            // doomednum
 		S_SNAILER1,     // spawnstate
 		1,              // spawnhealth
@@ -4659,7 +4659,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_VULTURE",
+		"VULTURE",
 		115,            // doomednum
 		S_VULTURE_STND, // spawnstate
 		1,              // spawnhealth
@@ -4687,7 +4687,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_POINTY",
+		"POINTY",
 		116,            // doomednum
 		S_POINTY1,      // spawnstate
 		1,              // spawnhealth
@@ -4715,7 +4715,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_POINTYBALL",
+		"POINTYBALL",
 		-1,             // doomednum
 		S_POINTYBALL1,  // spawnstate
 		1000,           // spawnhealth
@@ -4743,7 +4743,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROBOHOOD",
+		"ROBOHOOD",
 		117,              // doomednum
 		S_ROBOHOOD_LOOK,  // spawnstate
 		1,                // spawnhealth
@@ -4771,7 +4771,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FACESTABBER",
+		"FACESTABBER",
 		118,            // doomednum
 		S_FACESTABBER_STND1, // spawnstate
 		2,              // spawnhealth
@@ -4799,7 +4799,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FACESTABBERSPEAR",
+		"FACESTABBERSPEAR",
 		-1,              // doomednum
 		S_FACESTABBERSPEAR, // spawnstate
 		1,               // spawnhealth
@@ -4827,7 +4827,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGGUARD",
+		"EGGGUARD",
 		119,             // doomednum
 		S_EGGGUARD_STND, // spawnstate
 		1,               // spawnhealth
@@ -4855,7 +4855,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGSHIELD",
+		"EGGSHIELD",
 		-1,              // doomednum
 		S_EGGSHIELD,     // spawnstate
 		1,               // spawnhealth
@@ -4883,7 +4883,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GSNAPPER",
+		"GSNAPPER",
 		120,            // doomednum
 		S_SNAPPER_SPAWN,// spawnstate
 		1,              // spawnhealth
@@ -4911,7 +4911,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SNAPPER_LEG",
+		"SNAPPER_LEG",
 		-1,             // doomednum
 		S_SNAPPER_LEG,  // spawnstate
 		1,              // spawnhealth
@@ -4939,7 +4939,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SNAPPER_HEAD",
+		"SNAPPER_HEAD",
 		-1,             // doomednum
 		S_SNAPPER_HEAD, // spawnstate
 		1,              // spawnhealth
@@ -4967,7 +4967,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MINUS",
+		"MINUS",
 		121,            // doomednum
 		S_MINUS_INIT,   // spawnstate
 		1,              // spawnhealth
@@ -4995,7 +4995,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MINUSDIRT",
+		"MINUSDIRT",
 		-1,             // doomednum
 		S_MINUSDIRT1,   // spawnstate
 		1,              // spawnhealth
@@ -5023,7 +5023,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPRINGSHELL",
+		"SPRINGSHELL",
 		122,            // doomednum
 		S_SSHELL_STND,  // spawnstate
 		1,              // spawnhealth
@@ -5051,7 +5051,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_YELLOWSHELL",
+		"YELLOWSHELL",
 		125,            // doomednum
 		S_YSHELL_STND,  // spawnstate
 		1,              // spawnhealth
@@ -5079,7 +5079,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_UNIDUS",
+		"UNIDUS",
 		123,            // doomednum
 		S_UNIDUS_STND,  // spawnstate
 		1,              // spawnhealth
@@ -5107,7 +5107,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_UNIBALL",
+		"UNIBALL",
 		-1,             // doomednum
 		S_UNIDUS_BALL,  // spawnstate
 		1,              // spawnhealth
@@ -5135,7 +5135,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CANARIVORE",
+		"CANARIVORE",
 		134,            // doomednum
 		S_CANARIVORE_LOOK,  // spawnstate
 		1,              // spawnhealth
@@ -5163,7 +5163,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CANARIVORE_GAS",
+		"CANARIVORE_GAS",
 		-1,             // doomednum
 		S_CANARIVOREGAS_1,  // spawnstate
 		1,              // spawnhealth
@@ -5191,7 +5191,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PYREFLY",
+		"PYREFLY",
 		136,            // doomednum
 		S_PYREFLY_FLY,  // spawnstate
 		1,              // spawnhealth
@@ -5219,7 +5219,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PYREFLY_FIRE",
+		"PYREFLY_FIRE",
 		-1,             // doomednum
 		S_PYREFIRE1,    // spawnstate
 		1,              // spawnhealth
@@ -5247,7 +5247,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PTERABYTESPAWNER",
+		"PTERABYTESPAWNER",
 		135,            // doomednum
 		S_PTERABYTESPAWNER, // spawnstate
 		1,              // spawnhealth
@@ -5275,7 +5275,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PTERABYTEWAYPOINT",
+		"PTERABYTEWAYPOINT",
 		-1,             // doomednum
 		S_PTERABYTEWAYPOINT, // spawnstate
 		1,              // spawnhealth
@@ -5303,7 +5303,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PTERABYTE",
+		"PTERABYTE",
 		-1,             // doomednum
 		S_PTERABYTE_FLY1, // spawnstate
 		1,              // spawnhealth
@@ -5331,7 +5331,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DRAGONBOMBER",
+		"DRAGONBOMBER",
 		137,            // doomednum
 		S_DRAGONBOMBER, // spawnstate
 		1,              // spawnhealth
@@ -5359,7 +5359,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DRAGONWING",
+		"DRAGONWING",
 		-1,             // doomednum
 		S_DRAGONWING1,  // spawnstate
 		1000,           // spawnhealth
@@ -5387,7 +5387,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DRAGONTAIL",
+		"DRAGONTAIL",
 		-1,             // doomednum
 		S_DRAGONTAIL_LOADED, // spawnstate
 		1000,           // spawnhealth
@@ -5415,7 +5415,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DRAGONMINE",
+		"DRAGONMINE",
 		-1,             // doomednum
 		S_DRAGONMINE,   // spawnstate
 		1,              // spawnhealth
@@ -5443,7 +5443,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BOSSEXPLODE",
+		"BOSSEXPLODE",
 		-1,             // doomednum
 		S_BOSSEXPLODE,  // spawnstate
 		1000,           // spawnhealth
@@ -5471,7 +5471,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SONIC3KBOSSEXPLODE",
+		"SONIC3KBOSSEXPLODE",
 		-1,                      // doomednum
 		S_SONIC3KBOSSEXPLOSION1, // spawnstate
 		1000,                    // spawnhealth
@@ -5499,7 +5499,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BOSSFLYPOINT",
+		"BOSSFLYPOINT",
 		290,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -5527,7 +5527,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGTRAP",
+		"EGGTRAP",
 		291,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -5555,7 +5555,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BOSS3WAYPOINT",
+		"BOSS3WAYPOINT",
 		292,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -5583,7 +5583,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BOSS9GATHERPOINT",
+		"BOSS9GATHERPOINT",
 		293,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -5611,7 +5611,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BOSSJUNK",
+		"BOSSJUNK",
 		-1,             // doomednum
 		S_BOSSEGLZ1,    // spawnstate
 		1,              // spawnhealth
@@ -5639,7 +5639,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGMOBILE",
+		"EGGMOBILE",
 		200,               // doomednum
 		S_EGGMOBILE_STND,  // spawnstate
 		8,                 // spawnhealth
@@ -5667,7 +5667,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_JETFUME1",
+		"JETFUME1",
 		-1,             // doomednum
 		S_JETFUME1,     // spawnstate
 		1000,           // spawnhealth
@@ -5695,7 +5695,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGMOBILE_BALL",
+		"EGGMOBILE_BALL",
 		-1,             // doomednum
 		S_EGGMOBILE_BALL,// spawnstate
 		1,              // spawnhealth
@@ -5723,7 +5723,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGMOBILE_TARGET",
+		"EGGMOBILE_TARGET",
 		-1,             // doomednum
 		S_EGGMOBILE_TARGET, // spawnstate
 		1,              // spawnhealth
@@ -5751,7 +5751,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGMOBILE_FIRE",
+		"EGGMOBILE_FIRE",
 		-1,             // doomednum
 		S_LASERFLAME1,  // spawnstate
 		1,              // spawnhealth
@@ -5779,7 +5779,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGMOBILE2",
+		"EGGMOBILE2",
 		201,               // doomednum
 		S_EGGMOBILE2_STND, // spawnstate
 		8,                 // spawnhealth
@@ -5807,7 +5807,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGMOBILE2_POGO",
+		"EGGMOBILE2_POGO",
 		-1,             // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -5835,7 +5835,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GOOP",
+		"GOOP",
 		-1,             // doomednum
 		S_GOOP1,        // spawnstate
 		1000,           // spawnhealth
@@ -5863,7 +5863,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GOOPTRAIL",
+		"GOOPTRAIL",
 		-1,             // doomednum
 		S_GOOPTRAIL,    // spawnstate
 		1000,           // spawnhealth
@@ -5891,7 +5891,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGMOBILE3",
+		"EGGMOBILE3",
 		202,                // doomednum
 		S_EGGMOBILE3_STND,  // spawnstate
 		8,                  // spawnhealth
@@ -5919,7 +5919,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FAKEMOBILE",
+		"FAKEMOBILE",
 		-1,                 // doomednum
 		S_FAKEMOBILE_INIT,  // spawnstate
 		1000,               // spawnhealth
@@ -5947,7 +5947,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SHOCKWAVE",
+		"SHOCKWAVE",
 		-1,             // doomednum
 		S_SHOCKWAVE1,   // spawnstate
 		1000,           // spawnhealth
@@ -5975,7 +5975,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGMOBILE4",
+		"EGGMOBILE4",
 		203,               // doomednum
 		S_EGGMOBILE4_STND, // spawnstate
 		8,                 // spawnhealth
@@ -6003,7 +6003,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGMOBILE4_MACE",
+		"EGGMOBILE4_MACE",
 		-1,             // doomednum
 		S_EGGMOBILE4_MACE, // spawnstate
 		1000,           // spawnhealth
@@ -6031,7 +6031,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_JETFLAME",
+		"JETFLAME",
 		-1,             // doomednum
 		S_JETFLAME,     // spawnstate
 		1000,           // spawnhealth
@@ -6059,7 +6059,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGROBO1",
+		"EGGROBO1",
 		1127,           // doomednum
 		S_EGGROBO1_STND,// spawnstate
 		1000,           // spawnhealth
@@ -6087,7 +6087,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGROBOJET",
+		"EGGROBOJET",
 		-1,             // doomednum
 		S_EGGROBOJET,   // spawnstate
 		1000,           // spawnhealth
@@ -6115,7 +6115,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FANG",
+		"FANG",
 		204,               // doomednum
 		S_FANG_SETUP,      // spawnstate
 		8,                 // spawnhealth
@@ -6143,7 +6143,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BROKENROBOT",
+		"BROKENROBOT",
 		-1,             // doomednum
 		S_BROKENROBOTRANDOM, // spawnstate
 		1000,           // spawnhealth
@@ -6171,7 +6171,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_VWREF",
+		"VWREF",
 		-1,             // doomednum
 		S_VWREF,         // spawnstate
 		1,              // spawnhealth
@@ -6199,7 +6199,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_VWREB",
+		"VWREB",
 		-1,             // doomednum
 		S_VWREB,         // spawnstate
 		1,              // spawnhealth
@@ -6227,7 +6227,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PROJECTORLIGHT",
+		"PROJECTORLIGHT",
 		-1,             // doomednum
 		S_PROJECTORLIGHT1, // spawnstate
 		1,              // spawnhealth
@@ -6255,7 +6255,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FBOMB",
+		"FBOMB",
 		-1,                // doomednum
 		S_FBOMB1,          // spawnstate
 		1,                 // spawnhealth
@@ -6283,7 +6283,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TNTDUST",
+		"TNTDUST",
 		-1,                // doomednum
 		S_TNTDUST_1,       // spawnstate
 		1,                 // spawnhealth
@@ -6310,7 +6310,7 @@ static const mobjinfo_t startmobjinfo[] =
 		S_NULL             // raisestate
 	},
 	{
-		"MT_FSGNA",
+		"FSGNA",
 		-1,                // doomednum
 		S_FSGNA,           // spawnstate
 		1,                 // spawnhealth
@@ -6338,7 +6338,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FSGNB",
+		"FSGNB",
 		-1,                // doomednum
 		S_FSGNB,           // spawnstate
 		1,                 // spawnhealth
@@ -6366,7 +6366,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FANGWAYPOINT",
+		"FANGWAYPOINT",
 		294,               // doomednum
 		S_INVISIBLE,       // spawnstate
 		1000,              // spawnhealth
@@ -6394,7 +6394,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLACKEGGMAN",
+		"BLACKEGGMAN",
 		206,               // doomednum
 		S_BLACKEGG_STND,   // spawnstate
 		8,                 // spawnhealth
@@ -6422,7 +6422,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLACKEGGMAN_HELPER",
+		"BLACKEGGMAN_HELPER",
 		-1,                // doomednum
 		S_BLACKEGG_HELPER, // spawnstate
 		8,                 // spawnhealth
@@ -6450,7 +6450,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLACKEGGMAN_GOOPFIRE",
+		"BLACKEGGMAN_GOOPFIRE",
 		-1,             // doomednum
 		S_BLACKEGG_GOOP1, // spawnstate
 		1000,           // spawnhealth
@@ -6478,7 +6478,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLACKEGGMAN_MISSILE",
+		"BLACKEGGMAN_MISSILE",
 		-1,             // doomednum
 		S_BLACKEGG_MISSILE, // spawnstate
 		1000,           // spawnhealth
@@ -6506,7 +6506,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CYBRAKDEMON",
+		"CYBRAKDEMON",
 		209,                // doomednum
 		S_CYBRAKDEMON_IDLE, // spawnstate
 		12,                 // spawnhealth
@@ -6534,7 +6534,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CYBRAKDEMON_ELECTRIC_BARRIER",
+		"CYBRAKDEMON_ELECTRIC_BARRIER",
 		-1,             // doomednum
 		S_CYBRAKDEMONELECTRICBARRIER_INIT1, // spawnstate
 		1000,           // spawnhealth
@@ -6562,7 +6562,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CYBRAKDEMON_MISSILE",
+		"CYBRAKDEMON_MISSILE",
 		-1,             // doomednum
 		S_CYBRAKDEMONMISSILE, // spawnstate
 		1000,           // spawnhealth
@@ -6590,7 +6590,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CYBRAKDEMON_FLAMESHOT",
+		"CYBRAKDEMON_FLAMESHOT",
 		-1,             // doomednum
 		S_CYBRAKDEMONFLAMESHOT_FLY1, // spawnstate
 		1000,           // spawnhealth
@@ -6618,7 +6618,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CYBRAKDEMON_FLAMEREST",
+		"CYBRAKDEMON_FLAMEREST",
 		-1,             // doomednum
 		S_CYBRAKDEMONFLAMEREST, // spawnstate
 		1000,           // spawnhealth
@@ -6646,7 +6646,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CYBRAKDEMON_TARGET_RETICULE",
+		"CYBRAKDEMON_TARGET_RETICULE",
 		-1,             // doomednum
 		S_CYBRAKDEMONTARGETRETICULE1, // spawnstate
 		1000,           // spawnhealth
@@ -6674,7 +6674,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CYBRAKDEMON_TARGET_DOT",
+		"CYBRAKDEMON_TARGET_DOT",
 		-1,             // doomednum
 		S_CYBRAKDEMONTARGETDOT, // spawnstate
 		1000,           // spawnhealth
@@ -6702,7 +6702,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CYBRAKDEMON_NAPALM_BOMB_LARGE",
+		"CYBRAKDEMON_NAPALM_BOMB_LARGE",
 		-1,             // doomednum
 		S_CYBRAKDEMONNAPALMBOMBLARGE_FLY1, // spawnstate
 		1000,           // spawnhealth
@@ -6730,7 +6730,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CYBRAKDEMON_NAPALM_BOMB_SMALL",
+		"CYBRAKDEMON_NAPALM_BOMB_SMALL",
 		-1,             // doomednum
 		S_CYBRAKDEMONNAPALMBOMBSMALL, // spawnstate
 		1000,           // spawnhealth
@@ -6758,7 +6758,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CYBRAKDEMON_NAPALM_FLAMES",
+		"CYBRAKDEMON_NAPALM_FLAMES",
 		-1,             // doomednum
 		S_CYBRAKDEMONNAPALMFLAME_FLY1, // spawnstate
 		1000,           // spawnhealth
@@ -6786,7 +6786,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CYBRAKDEMON_VILE_EXPLOSION",
+		"CYBRAKDEMON_VILE_EXPLOSION",
 		-1,             // doomednum
 		S_CYBRAKDEMONVILEEXPLOSION1, // spawnstate
 		1,              // spawnhealth
@@ -6815,7 +6815,7 @@ static const mobjinfo_t startmobjinfo[] =
 
 
 	{
-		"MT_METALSONIC_RACE",
+		"METALSONIC_RACE",
 		207,                // doomednum
 		S_METALSONIC_RACE,  // spawnstate
 		8,                  // spawnhealth
@@ -6843,7 +6843,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_METALSONIC_BATTLE",
+		"METALSONIC_BATTLE",
 		208,                // doomednum
 		S_METALSONIC_FLOAT, // spawnstate
 		8,                  // spawnhealth
@@ -6871,7 +6871,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MSSHIELD_FRONT",
+		"MSSHIELD_FRONT",
 		-1,             // doomednum
 		S_MSSHIELD_F1,  // spawnstate
 		1,              // spawnhealth
@@ -6899,7 +6899,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MSGATHER",
+		"MSGATHER",
 		-1,             // doomednum
 		S_JETFUME1,     // spawnstate
 		1,              // spawnhealth
@@ -6927,7 +6927,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_RING",
+		"RING",
 		300,            // doomednum
 		S_RING,         // spawnstate
 		1000,           // spawnhealth
@@ -6955,7 +6955,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLINGRING",
+		"FLINGRING",
 		-1,             // doomednum
 		S_RING,         // spawnstate
 		1000,           // spawnhealth
@@ -6983,7 +6983,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUESPHERE",
+		"BLUESPHERE",
 		1706,           // doomednum
 		S_BLUESPHERE,   // spawnstate
 		1000,           // spawnhealth
@@ -7011,7 +7011,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLINGBLUESPHERE",
+		"FLINGBLUESPHERE",
 		-1,             // doomednum
 		S_BLUESPHERE,         // spawnstate
 		1000,           // spawnhealth
@@ -7039,7 +7039,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BOMBSPHERE",
+		"BOMBSPHERE",
 		520,            // doomednum
 		S_BOMBSPHERE1,  // spawnstate
 		1000,           // spawnhealth
@@ -7067,7 +7067,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_REDTEAMRING",
+		"REDTEAMRING",
 		308,            // doomednum
 		S_TEAMRING,     // spawnstate
 		1000,           // spawnhealth
@@ -7095,7 +7095,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUETEAMRING",
+		"BLUETEAMRING",
 		309,            // doomednum
 		S_TEAMRING,     // spawnstate
 		1000,           // spawnhealth
@@ -7123,7 +7123,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TOKEN",
+		"TOKEN",
 		312,            // doomednum
 		S_TOKEN,         // spawnstate
 		1000,           // spawnhealth
@@ -7151,7 +7151,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_REDFLAG",
+		"REDFLAG",
 		310,            // doomednum
 		S_REDFLAG,      // spawnstate
 		1000,           // spawnhealth
@@ -7179,7 +7179,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUEFLAG",
+		"BLUEFLAG",
 		311,            // doomednum
 		S_BLUEFLAG,     // spawnstate
 		1000,           // spawnhealth
@@ -7207,7 +7207,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EMBLEM",
+		"EMBLEM",
 		322,            // doomednum
 		S_EMBLEM1,      // spawnstate
 		1000,           // spawnhealth
@@ -7235,7 +7235,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EMERALD1",
+		"EMERALD1",
 		313,            // doomednum
 		S_CEMG1,        // spawnstate
 		1000,           // spawnhealth
@@ -7262,7 +7262,7 @@ static const mobjinfo_t startmobjinfo[] =
 		S_NULL          // raisestate
 	},
 	{
-		"MT_EMERALD2",
+		"EMERALD2",
 		314,            // doomednum
 		S_CEMG2,        // spawnstate
 		1000,           // spawnhealth
@@ -7289,7 +7289,7 @@ static const mobjinfo_t startmobjinfo[] =
 		S_NULL          // raisestate
 	},
 	{
-		"MT_EMERALD3",
+		"EMERALD3",
 		315,            // doomednum
 		S_CEMG3,        // spawnstate
 		1000,           // spawnhealth
@@ -7316,7 +7316,7 @@ static const mobjinfo_t startmobjinfo[] =
 		S_NULL          // raisestate
 	},
 	{
-		"MT_EMERALD4",
+		"EMERALD4",
 		316,            // doomednum
 		S_CEMG4,        // spawnstate
 		1000,           // spawnhealth
@@ -7343,7 +7343,7 @@ static const mobjinfo_t startmobjinfo[] =
 		S_NULL          // raisestate
 	},
 	{
-		"MT_EMERALD5",
+		"EMERALD5",
 		317,            // doomednum
 		S_CEMG5,        // spawnstate
 		1000,           // spawnhealth
@@ -7370,7 +7370,7 @@ static const mobjinfo_t startmobjinfo[] =
 		S_NULL          // raisestate
 	},
 	{
-		"MT_EMERALD6",
+		"EMERALD6",
 		318,            // doomednum
 		S_CEMG6,        // spawnstate
 		1000,           // spawnhealth
@@ -7397,7 +7397,7 @@ static const mobjinfo_t startmobjinfo[] =
 		S_NULL          // raisestate
 	},
 	{
-		"MT_EMERALD7",
+		"EMERALD7",
 		319,            // doomednum
 		S_CEMG7,        // spawnstate
 		1000,           // spawnhealth
@@ -7425,7 +7425,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EMERHUNT",
+		"EMERHUNT",
 		320,            // doomednum
 		S_SHRD1,        // spawnstate
 		1000,           // spawnhealth
@@ -7453,7 +7453,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EMERALDSPAWN",
+		"EMERALDSPAWN",
 		321,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -7481,7 +7481,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLINGEMERALD",
+		"FLINGEMERALD",
 		-1,             // doomednum
 		S_CEMG1,        // spawnstate
 		1000,           // spawnhealth
@@ -7509,7 +7509,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FAN",
+		"FAN",
 		540,            // doomednum
 		S_FAN,          // spawnstate
 		1000,           // spawnhealth
@@ -7537,7 +7537,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_STEAM",
+		"STEAM",
 		541,            // doomednum
 		S_STEAM1,       // spawnstate
 		1000,           // spawnhealth
@@ -7565,7 +7565,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BUMPER",
+		"BUMPER",
 		542,            // doomednum
 		S_BUMPER,       // spawnstate
 		1000,           // spawnhealth
@@ -7593,7 +7593,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BALLOON",
+		"BALLOON",
 		543,            // doomednum
 		S_BALLOON,      // spawnstate
 		1,              // spawnhealth
@@ -7621,7 +7621,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_YELLOWSPRING",
+		"YELLOWSPRING",
 		550,            // doomednum
 		S_YELLOWSPRING, // spawnstate
 		1000,           // spawnhealth
@@ -7649,7 +7649,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_REDSPRING",
+		"REDSPRING",
 		551,            // doomednum
 		S_REDSPRING,    // spawnstate
 		1000,           // spawnhealth
@@ -7677,7 +7677,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUESPRING",
+		"BLUESPRING",
 		552,            // doomednum
 		S_BLUESPRING,   // spawnstate
 		1000,           // spawnhealth
@@ -7705,7 +7705,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_YELLOWDIAG",
+		"YELLOWDIAG",
 		555,            // doomednum
 		S_YDIAG1,       // spawnstate
 		1,              // spawnhealth
@@ -7733,7 +7733,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_REDDIAG",
+		"REDDIAG",
 		556,            // doomednum
 		S_RDIAG1,       // spawnstate
 		1,              // spawnhealth
@@ -7761,7 +7761,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUEDIAG",
+		"BLUEDIAG",
 		557,            // doomednum
 		S_BDIAG1,       // spawnstate
 		1,              // spawnhealth
@@ -7789,7 +7789,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_YELLOWHORIZ",
+		"YELLOWHORIZ",
 		558,            // doomednum
 		S_YHORIZ1,      // spawnstate
 		1,              // spawnhealth
@@ -7817,7 +7817,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_REDHORIZ",
+		"REDHORIZ",
 		559,            // doomednum
 		S_RHORIZ1,      // spawnstate
 		1,              // spawnhealth
@@ -7845,7 +7845,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUEHORIZ",
+		"BLUEHORIZ",
 		560,            // doomednum
 		S_BHORIZ1,      // spawnstate
 		1,              // spawnhealth
@@ -7873,7 +7873,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BOOSTERSEG",
+		"BOOSTERSEG",
 		-1,             // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -7901,7 +7901,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BOOSTERROLLER",
+		"BOOSTERROLLER",
 		-1,             // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -7929,7 +7929,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_YELLOWBOOSTER",
+		"YELLOWBOOSTER",
 		544,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -7957,7 +7957,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_REDBOOSTER",
+		"REDBOOSTER",
 		545,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -7985,7 +7985,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BUBBLES",
+		"BUBBLES",
 		500,            // doomednum
 		S_BUBBLES1,     // spawnstate
 		1000,           // spawnhealth
@@ -8013,7 +8013,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SIGN",
+		"SIGN",
 		501,            // doomednum
 		S_SIGN,         // spawnstate
 		1000,           // spawnhealth
@@ -8041,7 +8041,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPIKEBALL",
+		"SPIKEBALL",
 		521,            // doomednum
 		S_SPIKEBALL1,   // spawnstate
 		1000,           // spawnhealth
@@ -8069,7 +8069,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPINFIRE",
+		"SPINFIRE",
 		-1,             // doomednum
 		S_SPINFIRE1,    // spawnstate
 		1,              // spawnhealth
@@ -8097,7 +8097,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPIKE",
+		"SPIKE",
 		523,            // doomednum
 		S_SPIKE1,       // spawnstate
 		1000,           // spawnhealth
@@ -8125,7 +8125,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WALLSPIKE",
+		"WALLSPIKE",
 		522,            // doomednum
 		S_WALLSPIKE1,   // spawnstate
 		1000,           // spawnhealth
@@ -8153,7 +8153,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WALLSPIKEBASE",
+		"WALLSPIKEBASE",
 		-1,            // doomednum
 		S_WALLSPIKEBASE, // spawnstate
 		1000,           // spawnhealth
@@ -8181,7 +8181,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_STARPOST",
+		"STARPOST",
 		502,            // doomednum
 		S_STARPOST_IDLE, // spawnstate
 		1,              // spawnhealth
@@ -8209,7 +8209,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BIGMINE",
+		"BIGMINE",
 		1012,           // doomednum
 		S_BIGMINE_IDLE, // spawnstate
 		1,              // spawnhealth
@@ -8237,7 +8237,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLASTEXECUTOR",
+		"BLASTEXECUTOR",
 		756,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -8265,7 +8265,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CANNONLAUNCHER",
+		"CANNONLAUNCHER",
 		1123,           // doomednum
 		S_CANNONLAUNCHER1, // spawnstate
 		1,              // spawnhealth
@@ -8293,7 +8293,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BOXSPARKLE",
+		"BOXSPARKLE",
 		-1,             // doomednum
 		S_BOXSPARKLE1,  // spawnstate
 		1,              // spawnhealth
@@ -8321,7 +8321,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_RING_BOX",
+		"RING_BOX",
 		400,            // doomednum
 		S_RING_BOX,     // spawnstate
 		1,              // spawnhealth
@@ -8349,7 +8349,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PITY_BOX",
+		"PITY_BOX",
 		401,            // doomednum
 		S_PITY_BOX,     // spawnstate
 		1,              // spawnhealth
@@ -8377,7 +8377,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ATTRACT_BOX",
+		"ATTRACT_BOX",
 		402,            // doomednum
 		S_ATTRACT_BOX,  // spawnstate
 		1,              // spawnhealth
@@ -8405,7 +8405,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FORCE_BOX",
+		"FORCE_BOX",
 		403,            // doomednum
 		S_FORCE_BOX,    // spawnstate
 		1,              // spawnhealth
@@ -8433,7 +8433,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ARMAGEDDON_BOX",
+		"ARMAGEDDON_BOX",
 		404,            // doomednum
 		S_ARMAGEDDON_BOX, // spawnstate
 		1,              // spawnhealth
@@ -8461,7 +8461,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WHIRLWIND_BOX",
+		"WHIRLWIND_BOX",
 		405,            // doomednum
 		S_WHIRLWIND_BOX, // spawnstate
 		1,              // spawnhealth
@@ -8489,7 +8489,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ELEMENTAL_BOX",
+		"ELEMENTAL_BOX",
 		406,            // doomednum
 		S_ELEMENTAL_BOX,     // spawnstate
 		1,              // spawnhealth
@@ -8517,7 +8517,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SNEAKERS_BOX",
+		"SNEAKERS_BOX",
 		407,            // doomednum
 		S_SNEAKERS_BOX, // spawnstate
 		1,              // spawnhealth
@@ -8545,7 +8545,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_INVULN_BOX",
+		"INVULN_BOX",
 		408,            // doomednum
 		S_INVULN_BOX,   // spawnstate
 		1,              // spawnhealth
@@ -8573,7 +8573,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_1UP_BOX",
+		"1UP_BOX",
 		409,            // doomednum
 		S_1UP_BOX,      // spawnstate
 		1,              // spawnhealth
@@ -8601,7 +8601,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGMAN_BOX",
+		"EGGMAN_BOX",
 		410,            // doomednum
 		S_EGGMAN_BOX,   // spawnstate
 		1,              // spawnhealth
@@ -8629,7 +8629,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MIXUP_BOX",
+		"MIXUP_BOX",
 		411,            // doomednum
 		S_MIXUP_BOX,    // spawnstate
 		1,              // spawnhealth
@@ -8657,7 +8657,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MYSTERY_BOX",
+		"MYSTERY_BOX",
 		-1, //412,      // doomednum
 		S_MYSTERY_BOX,  // spawnstate
 		1,              // spawnhealth
@@ -8685,7 +8685,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GRAVITY_BOX",
+		"GRAVITY_BOX",
 		413,            // doomednum
 		S_GRAVITY_BOX,  // spawnstate
 		1,              // spawnhealth
@@ -8713,7 +8713,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_RECYCLER_BOX",
+		"RECYCLER_BOX",
 		416,            // doomednum
 		S_RECYCLER_BOX, // spawnstate
 		1,              // spawnhealth
@@ -8741,7 +8741,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SCORE1K_BOX",
+		"SCORE1K_BOX",
 		418,            // doomednum
 		S_SCORE1K_BOX,  // spawnstate
 		1,              // spawnhealth
@@ -8769,7 +8769,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SCORE10K_BOX",
+		"SCORE10K_BOX",
 		419,            // doomednum
 		S_SCORE10K_BOX, // spawnstate
 		1,              // spawnhealth
@@ -8797,7 +8797,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLAMEAURA_BOX",
+		"FLAMEAURA_BOX",
 		420,            // doomednum
 		S_FLAMEAURA_BOX, // spawnstate
 		1,              // spawnhealth
@@ -8825,7 +8825,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BUBBLEWRAP_BOX",
+		"BUBBLEWRAP_BOX",
 		421,            // doomednum
 		S_BUBBLEWRAP_BOX, // spawnstate
 		1,              // spawnhealth
@@ -8853,7 +8853,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THUNDERCOIN_BOX",
+		"THUNDERCOIN_BOX",
 		422,            // doomednum
 		S_THUNDERCOIN_BOX, // spawnstate
 		1,              // spawnhealth
@@ -8881,7 +8881,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PITY_GOLDBOX",
+		"PITY_GOLDBOX",
 		431,            // doomednum
 		S_PITY_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -8909,7 +8909,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ATTRACT_GOLDBOX",
+		"ATTRACT_GOLDBOX",
 		432,            // doomednum
 		S_ATTRACT_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -8937,7 +8937,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FORCE_GOLDBOX",
+		"FORCE_GOLDBOX",
 		433,            // doomednum
 		S_FORCE_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -8965,7 +8965,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ARMAGEDDON_GOLDBOX",
+		"ARMAGEDDON_GOLDBOX",
 		434,            // doomednum
 		S_ARMAGEDDON_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -8993,7 +8993,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WHIRLWIND_GOLDBOX",
+		"WHIRLWIND_GOLDBOX",
 		435,            // doomednum
 		S_WHIRLWIND_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -9021,7 +9021,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ELEMENTAL_GOLDBOX",
+		"ELEMENTAL_GOLDBOX",
 		436,            // doomednum
 		S_ELEMENTAL_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -9049,7 +9049,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SNEAKERS_GOLDBOX",
+		"SNEAKERS_GOLDBOX",
 		437,            // doomednum
 		S_SNEAKERS_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -9077,7 +9077,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_INVULN_GOLDBOX",
+		"INVULN_GOLDBOX",
 		438,            // doomednum
 		S_INVULN_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -9105,7 +9105,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGMAN_GOLDBOX",
+		"EGGMAN_GOLDBOX",
 		440,            // doomednum
 		S_EGGMAN_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -9133,7 +9133,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GRAVITY_GOLDBOX",
+		"GRAVITY_GOLDBOX",
 		443,            // doomednum
 		S_GRAVITY_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -9161,7 +9161,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLAMEAURA_GOLDBOX",
+		"FLAMEAURA_GOLDBOX",
 		450,            // doomednum
 		S_FLAMEAURA_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -9189,7 +9189,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BUBBLEWRAP_GOLDBOX",
+		"BUBBLEWRAP_GOLDBOX",
 		451,            // doomednum
 		S_BUBBLEWRAP_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -9217,7 +9217,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THUNDERCOIN_GOLDBOX",
+		"THUNDERCOIN_GOLDBOX",
 		452,            // doomednum
 		S_THUNDERCOIN_GOLDBOX, // spawnstate
 		1,              // spawnhealth
@@ -9245,7 +9245,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{  		
-		"MT_RING_REDBOX",
+		"RING_REDBOX",
 		414,            // doomednum
 		S_RING_REDBOX1, // spawnstate
 		1,              // spawnhealth
@@ -9273,7 +9273,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_RING_BLUEBOX",
+		"RING_BLUEBOX",
 		415,            // doomednum
 		S_RING_BLUEBOX1, // spawnstate
 		1,              // spawnhealth
@@ -9301,7 +9301,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_RING_ICON",
+		"RING_ICON",
 		-1,              // doomednum
 		S_RING_ICON1,    // spawnstate
 		1,               // spawnhealth
@@ -9329,7 +9329,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PITY_ICON",
+		"PITY_ICON",
 		-1,             // doomednum
 		S_PITY_ICON1,   // spawnstate
 		1,              // spawnhealth
@@ -9357,7 +9357,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ATTRACT_ICON",
+		"ATTRACT_ICON",
 		-1,             // doomednum
 		S_ATTRACT_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9385,7 +9385,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FORCE_ICON",
+		"FORCE_ICON",
 		-1,             // doomednum
 		S_FORCE_ICON1,  // spawnstate
 		1,              // spawnhealth
@@ -9413,7 +9413,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ARMAGEDDON_ICON",
+		"ARMAGEDDON_ICON",
 		-1,             // doomednum
 		S_ARMAGEDDON_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9441,7 +9441,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WHIRLWIND_ICON",
+		"WHIRLWIND_ICON",
 		-1,             // doomednum
 		S_WHIRLWIND_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9469,7 +9469,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ELEMENTAL_ICON",
+		"ELEMENTAL_ICON",
 		-1,             // doomednum
 		S_ELEMENTAL_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9497,7 +9497,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SNEAKERS_ICON",
+		"SNEAKERS_ICON",
 		-1,             // doomednum
 		S_SNEAKERS_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9525,7 +9525,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_INVULN_ICON",
+		"INVULN_ICON",
 		-1,             // doomednum
 		S_INVULN_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9553,7 +9553,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_1UP_ICON",
+		"1UP_ICON",
 		-1,             // doomednum
 		S_1UP_ICON1,    // spawnstate
 		1,              // spawnhealth
@@ -9581,7 +9581,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGMAN_ICON",
+		"EGGMAN_ICON",
 		-1,             // doomednum
 		S_EGGMAN_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9609,7 +9609,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MIXUP_ICON",
+		"MIXUP_ICON",
 		-1,             // doomednum
 		S_MIXUP_ICON1,  // spawnstate
 		1,              // spawnhealth
@@ -9637,7 +9637,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GRAVITY_ICON",
+		"GRAVITY_ICON",
 		-1,             // doomednum
 		S_GRAVITY_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9665,7 +9665,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_RECYCLER_ICON",
+		"RECYCLER_ICON",
 		-1,             // doomednum
 		S_RECYCLER_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9693,7 +9693,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SCORE1K_ICON",
+		"SCORE1K_ICON",
 		-1,             // doomednum
 		S_SCORE1K_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9721,7 +9721,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SCORE10K_ICON",
+		"SCORE10K_ICON",
 		-1,             // doomednum
 		S_SCORE10K_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9749,7 +9749,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLAMEAURA_ICON",
+		"FLAMEAURA_ICON",
 		-1,             // doomednum
 		S_FLAMEAURA_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9777,7 +9777,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BUBBLEWRAP_ICON",
+		"BUBBLEWRAP_ICON",
 		-1,             // doomednum
 		S_BUBBLEWRAP_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9805,7 +9805,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THUNDERCOIN_ICON",
+		"THUNDERCOIN_ICON",
 		-1,             // doomednum
 		S_THUNDERCOIN_ICON1, // spawnstate
 		1,              // spawnhealth
@@ -9833,7 +9833,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKET",
+		"ROCKET",
 		-1,             // doomednum
 		S_ROCKET,       // spawnstate
 		1000,           // spawnhealth
@@ -9861,7 +9861,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LASER",
+		"LASER",
 		-1,             // doomednum
 		S_LASER,        // spawnstate
 		1000,           // spawnhealth
@@ -9889,7 +9889,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TORPEDO",
+		"TORPEDO",
 		-1,             // doomednum
 		S_TORPEDO,      // spawnstate
 		1000,           // spawnhealth
@@ -9917,7 +9917,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TORPEDO2",
+		"TORPEDO2",
 		-1,             // doomednum
 		S_TORPEDO,      // spawnstate
 		1000,           // spawnhealth
@@ -9945,7 +9945,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ENERGYBALL",
+		"ENERGYBALL",
 		-1,             // doomednum
 		S_ENERGYBALL1,  // spawnstate
 		1000,           // spawnhealth
@@ -9973,7 +9973,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MINE",
+		"MINE",
 		-1,             // doomednum
 		S_MINE1,        // spawnstate
 		1,              // spawnhealth
@@ -10001,7 +10001,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_JETTBULLET",
+		"JETTBULLET",
 		-1,             // doomednum
 		S_JETBULLET1,   // spawnstate
 		1,              // spawnhealth
@@ -10029,7 +10029,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TURRETLASER",
+		"TURRETLASER",
 		-1,             // doomednum
 		S_TURRETLASER,  // spawnstate
 		1000,           // spawnhealth
@@ -10057,7 +10057,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CANNONBALL",
+		"CANNONBALL",
 		-1,             // doomednum
 		S_CANNONBALL1,  // spawnstate
 		1,              // spawnhealth
@@ -10085,7 +10085,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CANNONBALLDECOR",
+		"CANNONBALLDECOR",
 		1124,           // doomednum
 		S_CANNONBALL1,  // spawnstate
 		1,              // spawnhealth
@@ -10113,7 +10113,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ARROW",
+		"ARROW",
 		-1,             // doomednum
 		S_ARROW,        // spawnstate
 		1,              // spawnhealth
@@ -10141,7 +10141,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DEMONFIRE",
+		"DEMONFIRE",
 		-1,             // doomednum
 		S_DEMONFIRE,    // spawnstate
 		1,              // spawnhealth
@@ -10169,7 +10169,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LETTER",
+		"LETTER",
 		-1,             // doomednum
 		S_LETTER,       // spawnstate
 		1,              // spawnhealth
@@ -10197,7 +10197,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TUTORIALPLANT",
+		"TUTORIALPLANT",
 		799,            // doomednum
 		S_NULL,         // spawnstate
 		1000,           // spawnhealth
@@ -10225,7 +10225,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TUTORIALLEAF",
+		"TUTORIALLEAF",
 		-1,            // doomednum
 		S_TUTORIALLEAF1,   // spawnstate
 		1000,           // spawnhealth
@@ -10253,7 +10253,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TUTORIALFLOWER",
+		"TUTORIALFLOWER",
 		-1,            // doomednum
 		S_TUTORIALFLOWER1,   // spawnstate
 		1000,           // spawnhealth
@@ -10281,7 +10281,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TUTORIALFLOWERF",
+		"TUTORIALFLOWERF",
 		-1,            // doomednum
 		S_TUTORIALFLOWERF1,   // spawnstate
 		1000,           // spawnhealth
@@ -10309,7 +10309,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GFZFLOWER1",
+		"GFZFLOWER1",
 		800,            // doomednum
 		S_GFZFLOWERA,   // spawnstate
 		1000,           // spawnhealth
@@ -10337,7 +10337,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GFZFLOWER2",
+		"GFZFLOWER2",
 		801,            // doomednum
 		S_GFZFLOWERB,  // spawnstate
 		1000,           // spawnhealth
@@ -10365,7 +10365,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GFZFLOWER3",
+		"GFZFLOWER3",
 		802,            // doomednum
 		S_GFZFLOWERC,  // spawnstate
 		1000,           // spawnhealth
@@ -10393,7 +10393,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUEBERRYBUSH",
+		"BLUEBERRYBUSH",
 		803,            // doomednum
 		S_BLUEBERRYBUSH, // spawnstate
 		1000,           // spawnhealth
@@ -10421,7 +10421,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BERRYBUSH",
+		"BERRYBUSH",
 		804,            // doomednum
 		S_BERRYBUSH,    // spawnstate
 		1000,           // spawnhealth
@@ -10449,7 +10449,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BUSH",
+		"BUSH",
 		805,            // doomednum
 		S_BUSH,         // spawnstate
 		1000,           // spawnhealth
@@ -10477,7 +10477,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GFZTREE",
+		"GFZTREE",
 		806,            // doomednum
 		S_GFZTREE,      // spawnstate
 		1000,           // spawnhealth
@@ -10505,7 +10505,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GFZBERRYTREE",
+		"GFZBERRYTREE",
 		807,            // doomednum
 		S_GFZBERRYTREE, // spawnstate
 		1000,           // spawnhealth
@@ -10533,7 +10533,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GFZCHERRYTREE",
+		"GFZCHERRYTREE",
 		808,            // doomednum
 		S_GFZCHERRYTREE, // spawnstate
 		1000,           // spawnhealth
@@ -10561,7 +10561,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CHECKERTREE",
+		"CHECKERTREE",
 		809,            // doomednum
 		S_CHECKERTREE,  // spawnstate
 		1000,           // spawnhealth
@@ -10589,7 +10589,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CHECKERSUNSETTREE",
+		"CHECKERSUNSETTREE",
 		810,            // doomednum
 		S_CHECKERSUNSETTREE, // spawnstate
 		1000,           // spawnhealth
@@ -10617,7 +10617,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FHZTREE",
+		"FHZTREE",
 		2102,           // doomednum
 		S_FHZTREE,      // spawnstate
 		1000,           // spawnhealth
@@ -10645,7 +10645,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FHZPINKTREE",
+		"FHZPINKTREE",
 		2103,           // doomednum
 		S_FHZPINKTREE,  // spawnstate
 		1000,           // spawnhealth
@@ -10673,7 +10673,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_POLYGONTREE",
+		"POLYGONTREE",
 		811,            // doomednum
 		S_POLYGONTREE,  // spawnstate
 		1000,           // spawnhealth
@@ -10701,7 +10701,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BUSHTREE",
+		"BUSHTREE",
 		812,            // doomednum
 		S_BUSHTREE,     // spawnstate
 		1000,           // spawnhealth
@@ -10729,7 +10729,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BUSHREDTREE",
+		"BUSHREDTREE",
 		813,            // doomednum
 		S_BUSHREDTREE,  // spawnstate
 		1000,           // spawnhealth
@@ -10757,7 +10757,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPRINGTREE",
+		"SPRINGTREE",
 		1600,           // doomednum
 		S_SPRINGTREE,   // spawnstate
 		1000,           // spawnhealth
@@ -10785,7 +10785,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THZFLOWER1",
+		"THZFLOWER1",
 		900,            // doomednum
 		S_THZFLOWERA,    // spawnstate
 		1000,           // spawnhealth
@@ -10813,7 +10813,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THZFLOWER2",
+		"THZFLOWER2",
 		902,            // doomednum
 		S_THZFLOWERB,    // spawnstate
 		1000,           // spawnhealth
@@ -10841,7 +10841,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THZFLOWER3",
+		"THZFLOWER3",
 		903,            // doomednum
 		S_THZFLOWERC,    // spawnstate
 		1000,           // spawnhealth
@@ -10869,7 +10869,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THZTREE",
+		"THZTREE",
 		904,            // doomednum
 		S_THZTREE,      // spawnstate
 		1000,           // spawnhealth
@@ -10897,7 +10897,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THZTREEBRANCH",
+		"THZTREEBRANCH",
 		-1,             // doomednum
 		S_THZTREEBRANCH1, // spawnstate
 		1000,           // spawnhealth
@@ -10925,7 +10925,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ALARM",
+		"ALARM",
 		901,            // doomednum
 		S_ALARM1,       // spawnstate
 		1000,           // spawnhealth
@@ -10953,7 +10953,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GARGOYLE",
+		"GARGOYLE",
 		1000,           // doomednum
 		S_GARGOYLE,     // spawnstate
 		1000,           // spawnhealth
@@ -10981,7 +10981,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BIGGARGOYLE",
+		"BIGGARGOYLE",
 		1009,           // doomednum
 		S_BIGGARGOYLE,  // spawnstate
 		1000,           // spawnhealth
@@ -11009,7 +11009,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SEAWEED",
+		"SEAWEED",
 		1001,           // doomednum
 		S_SEAWEED1,     // spawnstate
 		1000,           // spawnhealth
@@ -11037,7 +11037,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WATERDRIP",
+		"WATERDRIP",
 		1002,           // doomednum
 		S_DRIPA1,       // spawnstate
 		1000,           // spawnhealth
@@ -11065,7 +11065,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WATERDROP",
+		"WATERDROP",
 		-1,             // doomednum
 		S_DRIPB1,       // spawnstate
 		1000,           // spawnhealth
@@ -11093,7 +11093,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CORAL1",
+		"CORAL1",
 		1003,           // doomednum
 		S_CORAL1,       // spawnstate
 		1000,           // spawnhealth
@@ -11121,7 +11121,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CORAL2",
+		"CORAL2",
 		1004,           // doomednum
 		S_CORAL2,       // spawnstate
 		1000,           // spawnhealth
@@ -11149,7 +11149,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CORAL3",
+		"CORAL3",
 		1005,           // doomednum
 		S_CORAL3,       // spawnstate
 		1000,           // spawnhealth
@@ -11177,7 +11177,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CORAL4",
+		"CORAL4",
 		1014,           // doomednum
 		S_CORAL4,       // spawnstate
 		1000,           // spawnhealth
@@ -11205,7 +11205,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CORAL5",
+		"CORAL5",
 		1015,           // doomednum
 		S_CORAL5,       // spawnstate
 		1000,           // spawnhealth
@@ -11233,7 +11233,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUECRYSTAL",
+		"BLUECRYSTAL",
 		1006,           // doomednum
 		S_BLUECRYSTAL1, // spawnstate
 		1000,           // spawnhealth
@@ -11261,7 +11261,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_KELP",
+		"KELP",
 		1007,           // doomednum
 		S_KELP,         // spawnstate
 		1000,           // spawnhealth
@@ -11289,7 +11289,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ANIMALGAETOP",
+		"ANIMALGAETOP",
 		1013,            // doomednum
 		S_ANIMALGAETOP1, // spawnstate
 		1000,            // spawnhealth
@@ -11317,7 +11317,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ANIMALGAESEG",
+		"ANIMALGAESEG",
 		-1,             // doomednum
 		S_ANIMALGAESEG, // spawnstate
 		1000,           // spawnhealth
@@ -11345,7 +11345,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DSZSTALAGMITE",
+		"DSZSTALAGMITE",
 		1008,           // doomednum
 		S_DSZSTALAGMITE,// spawnstate
 		1000,           // spawnhealth
@@ -11373,7 +11373,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DSZ2STALAGMITE",
+		"DSZ2STALAGMITE",
 		1011,           // doomednum
 		S_DSZ2STALAGMITE, // spawnstate
 		1000,           // spawnhealth
@@ -11401,7 +11401,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LIGHTBEAM",
+		"LIGHTBEAM",
 		1010,           // doomednum
 		S_LIGHTBEAM1,   // spawnstate
 		1000,           // spawnhealth
@@ -11429,7 +11429,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CHAIN",
+		"CHAIN",
 		1100,           // doomednum
 		S_CEZCHAIN,     // spawnstate
 		1000,           // spawnhealth
@@ -11457,7 +11457,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLAME",
+		"FLAME",
 		1101,           // doomednum
 		S_FLAME,        // spawnstate
 		1000,           // spawnhealth
@@ -11485,7 +11485,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLAMEPARTICLE",
+		"FLAMEPARTICLE",
 		-1,             // doomednum
 		S_FLAMEPARTICLE,// spawnstate
 		1000,           // spawnhealth
@@ -11513,7 +11513,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGSTATUE",
+		"EGGSTATUE",
 		1102,           // doomednum
 		S_EGGSTATUE1,   // spawnstate
 		1000,           // spawnhealth
@@ -11541,7 +11541,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MACEPOINT",
+		"MACEPOINT",
 		1104,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -11569,7 +11569,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CHAINMACEPOINT",
+		"CHAINMACEPOINT",
 		1105,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -11597,7 +11597,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPRINGBALLPOINT",
+		"SPRINGBALLPOINT",
 		1106,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -11625,7 +11625,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CHAINPOINT",
+		"CHAINPOINT",
 		1107,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -11653,7 +11653,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HIDDEN_SLING",
+		"HIDDEN_SLING",
 		1108,           // doomednum
 		S_SLING1,       // spawnstate
 		1000,           // spawnhealth
@@ -11681,7 +11681,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FIREBARPOINT",
+		"FIREBARPOINT",
 		1109,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -11709,7 +11709,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CUSTOMMACEPOINT",
+		"CUSTOMMACEPOINT",
 		1110,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -11737,7 +11737,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SMALLMACECHAIN",
+		"SMALLMACECHAIN",
 		-1,               // doomednum
 		S_SMALLMACECHAIN, // spawnstate
 		1000,             // spawnhealth
@@ -11765,7 +11765,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BIGMACECHAIN",
+		"BIGMACECHAIN",
 		-1,             // doomednum
 		S_BIGMACECHAIN,	// spawnstate
 		1000,           // spawnhealth
@@ -11793,7 +11793,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SMALLMACE",
+		"SMALLMACE",
 		1130,           // doomednum
 		S_SMALLMACE,    // spawnstate
 		1000,           // spawnhealth
@@ -11821,7 +11821,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BIGMACE",
+		"BIGMACE",
 		1131,           // doomednum
 		S_BIGMACE,      // spawnstate
 		1000,           // spawnhealth
@@ -11849,7 +11849,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SMALLGRABCHAIN",
+		"SMALLGRABCHAIN",
 		-1,               // doomednum
 		S_SMALLGRABCHAIN, // spawnstate
 		1000,             // spawnhealth
@@ -11877,7 +11877,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BIGGRABCHAIN",
+		"BIGGRABCHAIN",
 		-1,             // doomednum
 		S_BIGGRABCHAIN, // spawnstate
 		1000,           // spawnhealth
@@ -11905,7 +11905,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUESPRINGBALL",
+		"BLUESPRINGBALL",
 		1133,           // doomednum
 		S_BLUESPRINGBALL, // spawnstate
 		1000,           // spawnhealth
@@ -11933,7 +11933,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_YELLOWSPRINGBALL",
+		"YELLOWSPRINGBALL",
 		1134,           // doomednum
 		S_YELLOWSPRINGBALL, // spawnstate
 		1000,           // spawnhealth
@@ -11961,7 +11961,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_REDSPRINGBALL",
+		"REDSPRINGBALL",
 		1135,           // doomednum
 		S_REDSPRINGBALL, // spawnstate
 		1000,           // spawnhealth
@@ -11989,7 +11989,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SMALLFIREBAR",
+		"SMALLFIREBAR",
 		1136,           // doomednum
 		S_SMALLFIREBAR1,     // spawnstate
 		1000,           // spawnhealth
@@ -12017,7 +12017,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BIGFIREBAR",
+		"BIGFIREBAR",
 		1137,           // doomednum
 		S_BIGFIREBAR1,  // spawnstate
 		1000,           // spawnhealth
@@ -12045,7 +12045,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CEZFLOWER",
+		"CEZFLOWER",
 		1103,           // doomednum
 		S_CEZFLOWER,    // spawnstate
 		1000,           // spawnhealth
@@ -12073,7 +12073,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CEZPOLE1",
+		"CEZPOLE1",
 		1117,           // doomednum
 		S_CEZPOLE,      // spawnstate
 		1000,           // spawnhealth
@@ -12101,7 +12101,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CEZPOLE2",
+		"CEZPOLE2",
 		1118,           // doomednum
 		S_CEZPOLE,      // spawnstate
 		1000,           // spawnhealth
@@ -12129,7 +12129,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CEZBANNER1",
+		"CEZBANNER1",
 		-1,             // doomednum
 		S_CEZBANNER1,    // spawnstate
 		1000,           // spawnhealth
@@ -12157,7 +12157,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CEZBANNER2",
+		"CEZBANNER2",
 		-1,             // doomednum
 		S_CEZBANNER2,    // spawnstate
 		1000,           // spawnhealth
@@ -12185,7 +12185,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PINETREE",
+		"PINETREE",
 		1114,           // doomednum
 		S_PINETREE,     // spawnstate
 		1000,           // spawnhealth
@@ -12213,7 +12213,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CEZBUSH1",
+		"CEZBUSH1",
 		1115,           // doomednum
 		S_CEZBUSH1,     // spawnstate
 		1000,           // spawnhealth
@@ -12241,7 +12241,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CEZBUSH2",
+		"CEZBUSH2",
 		1116,           // doomednum
 		S_CEZBUSH2,     // spawnstate
 		1000,           // spawnhealth
@@ -12269,7 +12269,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CANDLE",
+		"CANDLE",
 		1119,           // doomednum
 		S_CANDLE,       // spawnstate
 		1000,           // spawnhealth
@@ -12297,7 +12297,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CANDLEPRICKET",
+		"CANDLEPRICKET",
 		1120,           // doomednum
 		S_CANDLEPRICKET, // spawnstate
 		1000,           // spawnhealth
@@ -12325,7 +12325,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLAMEHOLDER",
+		"FLAMEHOLDER",
 		1121,           // doomednum
 		S_FLAMEHOLDER,  // spawnstate
 		1000,           // spawnhealth
@@ -12353,7 +12353,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FIRETORCH",
+		"FIRETORCH",
 		1122,           // doomednum
 		S_FIRETORCH,    // spawnstate
 		1000,           // spawnhealth
@@ -12381,7 +12381,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WAVINGFLAG1",
+		"WAVINGFLAG1",
 		1128,           // doomednum
 		S_WAVINGFLAG,   // spawnstate
 		1000,           // spawnhealth
@@ -12409,7 +12409,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WAVINGFLAG2",
+		"WAVINGFLAG2",
 		1129,           // doomednum
 		S_WAVINGFLAG,   // spawnstate
 		1000,           // spawnhealth
@@ -12437,7 +12437,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WAVINGFLAGSEG1",
+		"WAVINGFLAGSEG1",
 		-1,             // doomednum
 		S_WAVINGFLAGSEG1, // spawnstate
 		1000,           // spawnhealth
@@ -12465,7 +12465,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WAVINGFLAGSEG2",
+		"WAVINGFLAGSEG2",
 		-1,             // doomednum
 		S_WAVINGFLAGSEG2, // spawnstate
 		1000,           // spawnhealth
@@ -12493,7 +12493,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CRAWLASTATUE",
+		"CRAWLASTATUE",
 		1111,           // doomednum
 		S_CRAWLASTATUE, // spawnstate
 		1000,           // spawnhealth
@@ -12521,7 +12521,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FACESTABBERSTATUE",
+		"FACESTABBERSTATUE",
 		1112,           // doomednum
 		S_FACESTABBERSTATUE, // spawnstate
 		1000,           // spawnhealth
@@ -12549,7 +12549,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SUSPICIOUSFACESTABBERSTATUE",
+		"SUSPICIOUSFACESTABBERSTATUE",
 		1113,           // doomednum
 		S_SUSPICIOUSFACESTABBERSTATUE_WAIT, // spawnstate
 		1000,           // spawnhealth
@@ -12577,7 +12577,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BRAMBLES",
+		"BRAMBLES",
 		1125,           // doomednum
 		S_BRAMBLES,     // spawnstate
 		1000,           // spawnhealth
@@ -12605,7 +12605,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BIGTUMBLEWEED",
+		"BIGTUMBLEWEED",
 		1200,           // doomednum
 		S_BIGTUMBLEWEED,// spawnstate
 		1000,           // spawnhealth
@@ -12633,7 +12633,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LITTLETUMBLEWEED",
+		"LITTLETUMBLEWEED",
 		1201,           // doomednum
 		S_LITTLETUMBLEWEED,// spawnstate
 		1000,           // spawnhealth
@@ -12661,7 +12661,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTI1",
+		"CACTI1",
 		1203,           // doomednum
 		S_CACTI1,       // spawnstate
 		1000,           // spawnhealth
@@ -12689,7 +12689,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTI2",
+		"CACTI2",
 		1204,           // doomednum
 		S_CACTI2,       // spawnstate
 		1000,           // spawnhealth
@@ -12717,7 +12717,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTI3",
+		"CACTI3",
 		1205,           // doomednum
 		S_CACTI3,       // spawnstate
 		1000,           // spawnhealth
@@ -12745,7 +12745,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTI4",
+		"CACTI4",
 		1206,           // doomednum
 		S_CACTI4,       // spawnstate
 		1000,           // spawnhealth
@@ -12773,7 +12773,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTI5",
+		"CACTI5",
 		1207,           // doomednum
 		S_CACTI5,       // spawnstate
 		1000,           // spawnhealth
@@ -12801,7 +12801,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTI6",
+		"CACTI6",
 		1208,           // doomednum
 		S_CACTI6,       // spawnstate
 		1000,           // spawnhealth
@@ -12829,7 +12829,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTI7",
+		"CACTI7",
 		1209,           // doomednum
 		S_CACTI7,       // spawnstate
 		1000,           // spawnhealth
@@ -12857,7 +12857,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTI8",
+		"CACTI8",
 		1210,           // doomednum
 		S_CACTI8,       // spawnstate
 		1000,           // spawnhealth
@@ -12885,7 +12885,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTI9",
+		"CACTI9",
 		1211,           // doomednum
 		S_CACTI9,       // spawnstate
 		1000,           // spawnhealth
@@ -12913,7 +12913,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTI10",
+		"CACTI10",
 		1230,           // doomednum
 		S_CACTI10,       // spawnstate
 		1000,           // spawnhealth
@@ -12941,7 +12941,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTI11",
+		"CACTI11",
 		1231,           // doomednum
 		S_CACTI11,       // spawnstate
 		1000,           // spawnhealth
@@ -12969,7 +12969,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTITINYSEG",
+		"CACTITINYSEG",
 		-1,             // doomednum
 		S_CACTITINYSEG, // spawnstate
 		1000,           // spawnhealth
@@ -12997,7 +12997,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACTISMALLSEG",
+		"CACTISMALLSEG",
 		-1,              // doomednum
 		S_CACTISMALLSEG, // spawnstate
 		1000,            // spawnhealth
@@ -13025,7 +13025,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ARIDSIGN_CAUTION",
+		"ARIDSIGN_CAUTION",
 		1212,           // doomednum
 		S_ARIDSIGN_CAUTION,       // spawnstate
 		1000,           // spawnhealth
@@ -13053,7 +13053,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ARIDSIGN_CACTI",
+		"ARIDSIGN_CACTI",
 		1213,           // doomednum
 		S_ARIDSIGN_CACTI,       // spawnstate
 		1000,           // spawnhealth
@@ -13081,7 +13081,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ARIDSIGN_SHARPTURN",
+		"ARIDSIGN_SHARPTURN",
 		1214,           // doomednum
 		S_ARIDSIGN_SHARPTURN,       // spawnstate
 		1000,           // spawnhealth
@@ -13109,7 +13109,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_OILLAMP",
+		"OILLAMP",
 		1215,           // doomednum
 		S_OILLAMP,      // spawnstate
 		1,              // spawnhealth
@@ -13137,7 +13137,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TNTBARREL",
+		"TNTBARREL",
 		1216,           // doomednum
 		S_TNTBARREL_STND1,      // spawnstate
 		1,              // spawnhealth
@@ -13165,7 +13165,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PROXIMITYTNT",
+		"PROXIMITYTNT",
 		1217,           // doomednum
 		S_PROXIMITY_TNT,    // spawnstate
 		1,              // spawnhealth
@@ -13193,7 +13193,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DUSTDEVIL",
+		"DUSTDEVIL",
 		1218,           // doomednum
 		S_DUSTDEVIL,    // spawnstate
 		1,              // spawnhealth
@@ -13221,7 +13221,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DUSTLAYER",
+		"DUSTLAYER",
 		-1,             // doomednum
 		S_DUSTLAYER1,   // spawnstate
 		1,              // spawnhealth
@@ -13249,7 +13249,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ARIDDUST",
+		"ARIDDUST",
 		-1,             // doomednum
 		S_ARIDDUST1,    // spawnstate
 		1,              // spawnhealth
@@ -13277,7 +13277,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MINECART",
+		"MINECART",
 		-1,             // doomednum
 		S_MINECART_IDLE,// spawnstate
 		1,              // spawnhealth
@@ -13305,7 +13305,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MINECARTSEG",
+		"MINECARTSEG",
 		-1,             // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -13333,7 +13333,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MINECARTSPAWNER",
+		"MINECARTSPAWNER",
 		1219,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -13361,7 +13361,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MINECARTEND",
+		"MINECARTEND",
 		1220,           // doomednum
 		S_MINECARTEND,  // spawnstate
 		1,              // spawnhealth
@@ -13389,7 +13389,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MINECARTENDSOLID",
+		"MINECARTENDSOLID",
 		-1,             // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -13417,7 +13417,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MINECARTSIDEMARK",
+		"MINECARTSIDEMARK",
 		-1,             // doomednum
 		S_MINECARTSIDEMARK2, // spawnstate
 		1,              // spawnhealth
@@ -13445,7 +13445,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MINECARTSPARK",
+		"MINECARTSPARK",
 		-1,             // doomednum
 		S_MINECARTSPARK,// spawnstate
 		1,              // spawnhealth
@@ -13473,7 +13473,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SALOONDOOR",
+		"SALOONDOOR",
 		-1,             // doomednum
 		S_SALOONDOOR,   // spawnstate
 		1,              // spawnhealth
@@ -13501,7 +13501,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SALOONDOORCENTER",
+		"SALOONDOORCENTER",
 		1221,           // doomednum
 		S_SALOONDOORCENTER, // spawnstate
 		1,              // spawnhealth
@@ -13529,7 +13529,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TRAINCAMEOSPAWNER",
+		"TRAINCAMEOSPAWNER",
 		1222,           // doomednum
 		S_TRAINCAMEOSPAWNER_1,    // spawnstate
 		1,              // spawnhealth
@@ -13557,7 +13557,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TRAINSEG",
+		"TRAINSEG",
 		-1,             // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -13585,7 +13585,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TRAINDUSTSPAWNER",
+		"TRAINDUSTSPAWNER",
 		1223,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -13613,7 +13613,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TRAINSTEAMSPAWNER",
+		"TRAINSTEAMSPAWNER",
 		1224,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -13641,7 +13641,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MINECARTSWITCHPOINT",
+		"MINECARTSWITCHPOINT",
 		1229,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -13669,7 +13669,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLAMEJET",
+		"FLAMEJET",
 		1300,           // doomednum
 		S_FLAMEJETSTND, // spawnstate
 		1000,           // spawnhealth
@@ -13697,7 +13697,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_VERTICALFLAMEJET",
+		"VERTICALFLAMEJET",
 		1301,           // doomednum
 		S_FLAMEJETSTND, // spawnstate
 		1000,           // spawnhealth
@@ -13725,7 +13725,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLAMEJETFLAME",
+		"FLAMEJETFLAME",
 		-1,             // doomednum
 		S_FLAMEJETFLAME1, // spawnstate
 		1000,           // spawnhealth
@@ -13753,7 +13753,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FJSPINAXISA",
+		"FJSPINAXISA",
 		1302,           // doomednum
 		S_FJSPINAXISA1, // spawnstate
 		1000,           // spawnhealth
@@ -13781,7 +13781,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FJSPINAXISB",
+		"FJSPINAXISB",
 		1303,           // doomednum
 		S_FJSPINAXISB1, // spawnstate
 		1000,           // spawnhealth
@@ -13809,7 +13809,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLAMEJETFLAMEB",
+		"FLAMEJETFLAMEB",
 		-1,             // doomednum
 		S_FLAMEJETFLAMEB1, // spawnstate
 		1000,           // spawnhealth
@@ -13837,7 +13837,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LAVAFALL",
+		"LAVAFALL",
 		1304,           // doomednum
 		S_LAVAFALL_DORMANT, // spawnstate
 		1000,           // spawnhealth
@@ -13865,7 +13865,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LAVAFALL_LAVA",
+		"LAVAFALL_LAVA",
 		-1,             // doomednum
 		S_LAVAFALL_LAVA1, // spawnstate
 		1000,           // spawnhealth
@@ -13893,7 +13893,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LAVAFALLROCK",
+		"LAVAFALLROCK",
 		-1,             // doomednum
 		S_LAVAFALLROCK, // spawnstate
 		1000,           // spawnhealth
@@ -13921,7 +13921,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROLLOUTSPAWN",
+		"ROLLOUTSPAWN",
 		1305,           // doomednum
 		S_ROLLOUTSPAWN, // spawnstate
 		1000,           // spawnhealth
@@ -13949,7 +13949,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROLLOUTROCK",
+		"ROLLOUTROCK",
 		-1,             // doomednum
 		S_ROLLOUTROCK,  // spawnstate
 		1000,           // spawnhealth
@@ -13977,7 +13977,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BIGFERNLEAF",
+		"BIGFERNLEAF",
 		-1,             // doomednum
 		S_BIGFERNLEAF,  // spawnstate
 		1000,           // spawnhealth
@@ -14005,7 +14005,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BIGFERN",
+		"BIGFERN",
 		1306,           // doomednum
 		S_BIGFERN1,     // spawnstate
 		1000,           // spawnhealth
@@ -14033,7 +14033,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_JUNGLEPALM",
+		"JUNGLEPALM",
 		1307,           // doomednum
 		S_JUNGLEPALM,   // spawnstate
 		1000,           // spawnhealth
@@ -14061,7 +14061,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TORCHFLOWER",
+		"TORCHFLOWER",
 		1308,           // doomednum
 		S_TORCHFLOWER,  // spawnstate
 		1000,           // spawnhealth
@@ -14089,7 +14089,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WALLVINE_LONG",
+		"WALLVINE_LONG",
 		1309,           // doomednum
 		S_WALLVINE_LONG, // spawnstate
 		1000,           // spawnhealth
@@ -14117,7 +14117,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WALLVINE_SHORT",
+		"WALLVINE_SHORT",
 		1310,           // doomednum
 		S_WALLVINE_SHORT, // spawnstate
 		1000,           // spawnhealth
@@ -14145,7 +14145,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GLAREGOYLE",
+		"GLAREGOYLE",
 		1500,           // doomednum
 		S_GLAREGOYLE,    // spawnstate
 		1000,           // spawnhealth
@@ -14173,7 +14173,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GLAREGOYLEUP",
+		"GLAREGOYLEUP",
 		1501,           // doomednum
 		S_GLAREGOYLEUP,  // spawnstate
 		1000,           // spawnhealth
@@ -14201,7 +14201,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GLAREGOYLEDOWN",
+		"GLAREGOYLEDOWN",
 		1502,           // doomednum
 		S_GLAREGOYLEDOWN,// spawnstate
 		1000,           // spawnhealth
@@ -14229,7 +14229,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GLAREGOYLELONG",
+		"GLAREGOYLELONG",
 		1503,           // doomednum
 		S_GLAREGOYLELONG,// spawnstate
 		1000,           // spawnhealth
@@ -14257,7 +14257,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TARGET",
+		"TARGET",
 		1504,           // doomednum
 		S_TARGET_IDLE,  // spawnstate
 		1,              // spawnhealth
@@ -14285,7 +14285,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GREENFLAME",
+		"GREENFLAME",
 		1505,           // doomednum
 		S_GREENFLAME,   // spawnstate
 		1000,           // spawnhealth
@@ -14313,7 +14313,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUEGARGOYLE",
+		"BLUEGARGOYLE",
 		1506,           // doomednum
 		S_BLUEGARGOYLE, // spawnstate
 		1000,           // spawnhealth
@@ -14341,7 +14341,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_STALAGMITE0",
+		"STALAGMITE0",
 		1900,           // doomednum
 		S_STG0,         // spawnstate
 		1000,           // spawnhealth
@@ -14369,7 +14369,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_STALAGMITE1",
+		"STALAGMITE1",
 		1901,           // doomednum
 		S_STG1,         // spawnstate
 		1000,           // spawnhealth
@@ -14397,7 +14397,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_STALAGMITE2",
+		"STALAGMITE2",
 		1902,           // doomednum
 		S_STG2,         // spawnstate
 		1000,           // spawnhealth
@@ -14425,7 +14425,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_STALAGMITE3",
+		"STALAGMITE3",
 		1903,           // doomednum
 		S_STG3,         // spawnstate
 		1000,           // spawnhealth
@@ -14453,7 +14453,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_STALAGMITE4",
+		"STALAGMITE4",
 		1904,           // doomednum
 		S_STG4,         // spawnstate
 		1000,           // spawnhealth
@@ -14481,7 +14481,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_STALAGMITE5",
+		"STALAGMITE5",
 		1905,           // doomednum
 		S_STG5,         // spawnstate
 		1000,           // spawnhealth
@@ -14509,7 +14509,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_STALAGMITE6",
+		"STALAGMITE6",
 		1906,           // doomednum
 		S_STG6,         // spawnstate
 		1000,           // spawnhealth
@@ -14537,7 +14537,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_STALAGMITE7",
+		"STALAGMITE7",
 		1907,           // doomednum
 		S_STG7,         // spawnstate
 		1000,           // spawnhealth
@@ -14565,7 +14565,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_STALAGMITE8",
+		"STALAGMITE8",
 		1908,           // doomednum
 		S_STG8,         // spawnstate
 		1000,           // spawnhealth
@@ -14593,7 +14593,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_STALAGMITE9",
+		"STALAGMITE9",
 		1909,           // doomednum
 		S_STG9,         // spawnstate
 		1000,           // spawnhealth
@@ -14621,7 +14621,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_XMASPOLE",
+		"XMASPOLE",
 		1850,           // doomednum
 		S_XMASPOLE,     // spawnstate
 		1000,           // spawnhealth
@@ -14649,7 +14649,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CANDYCANE",
+		"CANDYCANE",
 		1851,           // doomednum
 		S_CANDYCANE,    // spawnstate
 		1000,           // spawnhealth
@@ -14677,7 +14677,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SNOWMAN",
+		"SNOWMAN",
 		1852,           // doomednum
 		S_SNOWMAN,      // spawnstate
 		1000,           // spawnhealth
@@ -14705,7 +14705,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SNOWMANHAT",
+		"SNOWMANHAT",
 		1853,           // doomednum
 		S_SNOWMANHAT,   // spawnstate
 		1000,           // spawnhealth
@@ -14733,7 +14733,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LAMPPOST1",
+		"LAMPPOST1",
 		1854,           // doomednum
 		S_LAMPPOST1,    // spawnstate
 		1000,           // spawnhealth
@@ -14761,7 +14761,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LAMPPOST2",
+		"LAMPPOST2",
 		1855,           // doomednum
 		S_LAMPPOST2,    // spawnstate
 		1000,           // spawnhealth
@@ -14789,7 +14789,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HANGSTAR",
+		"HANGSTAR",
 		1856,           // doomednum
 		S_HANGSTAR,     // spawnstate
 		1000,           // spawnhealth
@@ -14817,7 +14817,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MISTLETOE",
+		"MISTLETOE",
 		2105,           // doomednum
 		S_MISTLETOE,    // spawnstate
 		1000,           // spawnhealth
@@ -14845,7 +14845,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_XMASBLUEBERRYBUSH",
+		"XMASBLUEBERRYBUSH",
 		1859,           // doomednum
 		S_XMASBLUEBERRYBUSH, // spawnstate
 		1000,           // spawnhealth
@@ -14873,7 +14873,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_XMASBERRYBUSH",
+		"XMASBERRYBUSH",
 		1857,           // doomednum
 		S_XMASBERRYBUSH, // spawnstate
 		1000,           // spawnhealth
@@ -14901,7 +14901,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_XMASBUSH",
+		"XMASBUSH",
 		1858,           // doomednum
 		S_XMASBUSH,     // spawnstate
 		1000,           // spawnhealth
@@ -14929,7 +14929,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FHZICE1",
+		"FHZICE1",
 		2100,           // doomednum
 		S_FHZICE1,      // spawnstate
 		1000,           // spawnhealth
@@ -14957,7 +14957,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FHZICE2",
+		"FHZICE2",
 		2101,           // doomednum
 		S_FHZICE2,      // spawnstate
 		1000,           // spawnhealth
@@ -14985,7 +14985,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROSY",
+		"ROSY",
 		2104,           // doomednum
 		S_ROSY_IDLE1,   // spawnstate
 		1000,           // spawnhealth
@@ -15013,7 +15013,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CDLHRT",
+		"CDLHRT",
 		-1,             // doomednum
 		S_LHRT,         // spawnstate
 		1000,           // spawnhealth
@@ -15041,7 +15041,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_JACKO1",
+		"JACKO1",
 		2006,           // doomednum
 		S_JACKO1,       // spawnstate
 		1000,           // spawnhealth
@@ -15069,7 +15069,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_JACKO2",
+		"JACKO2",
 		2007,           // doomednum
 		S_JACKO2,       // spawnstate
 		1000,           // spawnhealth
@@ -15097,7 +15097,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_JACKO3",
+		"JACKO3",
 		2008,           // doomednum
 		S_JACKO3,       // spawnstate
 		1000,           // spawnhealth
@@ -15125,7 +15125,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HHZTREE_TOP",
+		"HHZTREE_TOP",
 		2010,           // doomednum
 		S_HHZTREE_TOP,  // spawnstate
 		1000,           // spawnhealth
@@ -15153,7 +15153,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HHZTREE_PART",
+		"HHZTREE_PART",
 		-1,             // doomednum
 		S_HHZTREE_TRUNK,// spawnstate
 		1000,           // spawnhealth
@@ -15181,7 +15181,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HHZSHROOM",
+		"HHZSHROOM",
 		2009,           // doomednum
 		S_HHZSHROOM_1,    // spawnstate
 		1000,           // spawnhealth
@@ -15209,7 +15209,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HHZGRASS",
+		"HHZGRASS",
 		2001,           // doomednum
 		S_HHZGRASS,     // spawnstate
 		1000,           // spawnhealth
@@ -15237,7 +15237,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HHZTENTACLE1",
+		"HHZTENTACLE1",
 		2002,           // doomednum
 		S_HHZTENT1,     // spawnstate
 		1000,           // spawnhealth
@@ -15265,7 +15265,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HHZTENTACLE2",
+		"HHZTENTACLE2",
 		2003,           // doomednum
 		S_HHZTENT2,     // spawnstate
 		1000,           // spawnhealth
@@ -15293,7 +15293,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HHZSTALAGMITE_TALL",
+		"HHZSTALAGMITE_TALL",
 		2004,           // doomednum
 		S_HHZSTALAGMITE_TALL, // spawnstate
 		1000,           // spawnhealth
@@ -15321,7 +15321,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HHZSTALAGMITE_SHORT",
+		"HHZSTALAGMITE_SHORT",
 		2005,           // doomednum
 		S_HHZSTALAGMITE_SHORT, // spawnstate
 		1000,           // spawnhealth
@@ -15352,7 +15352,7 @@ static const mobjinfo_t startmobjinfo[] =
 	// I made a script to make all of these for me.
 	// Ha HA. ~Inuyasha
 	{
-		"MT_BSZTALLFLOWER_RED",
+		"BSZTALLFLOWER_RED",
 		1400,           // doomednum
 		S_BSZTALLFLOWER_RED, // spawnstate
 		1000,           // spawnhealth
@@ -15380,7 +15380,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZTALLFLOWER_PURPLE",
+		"BSZTALLFLOWER_PURPLE",
 		1401,           // doomednum
 		S_BSZTALLFLOWER_PURPLE, // spawnstate
 		1000,           // spawnhealth
@@ -15408,7 +15408,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZTALLFLOWER_BLUE",
+		"BSZTALLFLOWER_BLUE",
 		1402,           // doomednum
 		S_BSZTALLFLOWER_BLUE, // spawnstate
 		1000,           // spawnhealth
@@ -15436,7 +15436,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZTALLFLOWER_CYAN",
+		"BSZTALLFLOWER_CYAN",
 		1403,           // doomednum
 		S_BSZTALLFLOWER_CYAN, // spawnstate
 		1000,           // spawnhealth
@@ -15464,7 +15464,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZTALLFLOWER_YELLOW",
+		"BSZTALLFLOWER_YELLOW",
 		1404,           // doomednum
 		S_BSZTALLFLOWER_YELLOW, // spawnstate
 		1000,           // spawnhealth
@@ -15492,7 +15492,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZTALLFLOWER_ORANGE",
+		"BSZTALLFLOWER_ORANGE",
 		1405,           // doomednum
 		S_BSZTALLFLOWER_ORANGE, // spawnstate
 		1000,           // spawnhealth
@@ -15520,7 +15520,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZFLOWER_RED",
+		"BSZFLOWER_RED",
 		1410,           // doomednum
 		S_BSZFLOWER_RED, // spawnstate
 		1000,           // spawnhealth
@@ -15548,7 +15548,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZFLOWER_PURPLE",
+		"BSZFLOWER_PURPLE",
 		1411,           // doomednum
 		S_BSZFLOWER_PURPLE, // spawnstate
 		1000,           // spawnhealth
@@ -15576,7 +15576,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZFLOWER_BLUE",
+		"BSZFLOWER_BLUE",
 		1412,           // doomednum
 		S_BSZFLOWER_BLUE, // spawnstate
 		1000,           // spawnhealth
@@ -15604,7 +15604,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZFLOWER_CYAN",
+		"BSZFLOWER_CYAN",
 		1413,           // doomednum
 		S_BSZFLOWER_CYAN, // spawnstate
 		1000,           // spawnhealth
@@ -15632,7 +15632,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZFLOWER_YELLOW",
+		"BSZFLOWER_YELLOW",
 		1414,           // doomednum
 		S_BSZFLOWER_YELLOW, // spawnstate
 		1000,           // spawnhealth
@@ -15660,7 +15660,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZFLOWER_ORANGE",
+		"BSZFLOWER_ORANGE",
 		1415,           // doomednum
 		S_BSZFLOWER_ORANGE, // spawnstate
 		1000,           // spawnhealth
@@ -15688,7 +15688,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZSHORTFLOWER_RED",
+		"BSZSHORTFLOWER_RED",
 		1420,           // doomednum
 		S_BSZSHORTFLOWER_RED, // spawnstate
 		1000,           // spawnhealth
@@ -15716,7 +15716,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZSHORTFLOWER_PURPLE",
+		"BSZSHORTFLOWER_PURPLE",
 		1421,           // doomednum
 		S_BSZSHORTFLOWER_PURPLE, // spawnstate
 		1000,           // spawnhealth
@@ -15744,7 +15744,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZSHORTFLOWER_BLUE",
+		"BSZSHORTFLOWER_BLUE",
 		1422,           // doomednum
 		S_BSZSHORTFLOWER_BLUE, // spawnstate
 		1000,           // spawnhealth
@@ -15772,7 +15772,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZSHORTFLOWER_CYAN",
+		"BSZSHORTFLOWER_CYAN",
 		1423,           // doomednum
 		S_BSZSHORTFLOWER_CYAN, // spawnstate
 		1000,           // spawnhealth
@@ -15800,7 +15800,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZSHORTFLOWER_YELLOW",
+		"BSZSHORTFLOWER_YELLOW",
 		1424,           // doomednum
 		S_BSZSHORTFLOWER_YELLOW, // spawnstate
 		1000,           // spawnhealth
@@ -15828,7 +15828,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZSHORTFLOWER_ORANGE",
+		"BSZSHORTFLOWER_ORANGE",
 		1425,           // doomednum
 		S_BSZSHORTFLOWER_ORANGE, // spawnstate
 		1000,           // spawnhealth
@@ -15856,7 +15856,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZTULIP_RED",
+		"BSZTULIP_RED",
 		1430,           // doomednum
 		S_BSZTULIP_RED, // spawnstate
 		1000,           // spawnhealth
@@ -15884,7 +15884,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZTULIP_PURPLE",
+		"BSZTULIP_PURPLE",
 		1431,           // doomednum
 		S_BSZTULIP_PURPLE, // spawnstate
 		1000,           // spawnhealth
@@ -15912,7 +15912,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZTULIP_BLUE",
+		"BSZTULIP_BLUE",
 		1432,           // doomednum
 		S_BSZTULIP_BLUE, // spawnstate
 		1000,           // spawnhealth
@@ -15940,7 +15940,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZTULIP_CYAN",
+		"BSZTULIP_CYAN",
 		1433,           // doomednum
 		S_BSZTULIP_CYAN, // spawnstate
 		1000,           // spawnhealth
@@ -15968,7 +15968,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZTULIP_YELLOW",
+		"BSZTULIP_YELLOW",
 		1434,           // doomednum
 		S_BSZTULIP_YELLOW, // spawnstate
 		1000,           // spawnhealth
@@ -15996,7 +15996,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZTULIP_ORANGE",
+		"BSZTULIP_ORANGE",
 		1435,           // doomednum
 		S_BSZTULIP_ORANGE, // spawnstate
 		1000,           // spawnhealth
@@ -16024,7 +16024,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZCLUSTER_RED",
+		"BSZCLUSTER_RED",
 		1440,           // doomednum
 		S_BSZCLUSTER_RED, // spawnstate
 		1000,           // spawnhealth
@@ -16052,7 +16052,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZCLUSTER_PURPLE",
+		"BSZCLUSTER_PURPLE",
 		1441,           // doomednum
 		S_BSZCLUSTER_PURPLE, // spawnstate
 		1000,           // spawnhealth
@@ -16080,7 +16080,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZCLUSTER_BLUE",
+		"BSZCLUSTER_BLUE",
 		1442,           // doomednum
 		S_BSZCLUSTER_BLUE, // spawnstate
 		1000,           // spawnhealth
@@ -16108,7 +16108,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZCLUSTER_CYAN",
+		"BSZCLUSTER_CYAN",
 		1443,           // doomednum
 		S_BSZCLUSTER_CYAN, // spawnstate
 		1000,           // spawnhealth
@@ -16136,7 +16136,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZCLUSTER_YELLOW",
+		"BSZCLUSTER_YELLOW",
 		1444,           // doomednum
 		S_BSZCLUSTER_YELLOW, // spawnstate
 		1000,           // spawnhealth
@@ -16164,7 +16164,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZCLUSTER_ORANGE",
+		"BSZCLUSTER_ORANGE",
 		1445,           // doomednum
 		S_BSZCLUSTER_ORANGE, // spawnstate
 		1000,           // spawnhealth
@@ -16192,7 +16192,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZBUSH_RED",
+		"BSZBUSH_RED",
 		1450,           // doomednum
 		S_BSZBUSH_RED,  // spawnstate
 		1000,           // spawnhealth
@@ -16220,7 +16220,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZBUSH_PURPLE",
+		"BSZBUSH_PURPLE",
 		1451,           // doomednum
 		S_BSZBUSH_PURPLE, // spawnstate
 		1000,           // spawnhealth
@@ -16248,7 +16248,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZBUSH_BLUE",
+		"BSZBUSH_BLUE",
 		1452,           // doomednum
 		S_BSZBUSH_BLUE, // spawnstate
 		1000,           // spawnhealth
@@ -16276,7 +16276,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZBUSH_CYAN",
+		"BSZBUSH_CYAN",
 		1453,           // doomednum
 		S_BSZBUSH_CYAN, // spawnstate
 		1000,           // spawnhealth
@@ -16304,7 +16304,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZBUSH_YELLOW",
+		"BSZBUSH_YELLOW",
 		1454,           // doomednum
 		S_BSZBUSH_YELLOW, // spawnstate
 		1000,           // spawnhealth
@@ -16332,7 +16332,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZBUSH_ORANGE",
+		"BSZBUSH_ORANGE",
 		1455,           // doomednum
 		S_BSZBUSH_ORANGE, // spawnstate
 		1000,           // spawnhealth
@@ -16360,7 +16360,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZVINE_RED",
+		"BSZVINE_RED",
 		1460,           // doomednum
 		S_BSZVINE_RED,  // spawnstate
 		1000,           // spawnhealth
@@ -16388,7 +16388,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZVINE_PURPLE",
+		"BSZVINE_PURPLE",
 		1461,           // doomednum
 		S_BSZVINE_PURPLE, // spawnstate
 		1000,           // spawnhealth
@@ -16416,7 +16416,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZVINE_BLUE",
+		"BSZVINE_BLUE",
 		1462,           // doomednum
 		S_BSZVINE_BLUE, // spawnstate
 		1000,           // spawnhealth
@@ -16444,7 +16444,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZVINE_CYAN",
+		"BSZVINE_CYAN",
 		1463,           // doomednum
 		S_BSZVINE_CYAN, // spawnstate
 		1000,           // spawnhealth
@@ -16472,7 +16472,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZVINE_YELLOW",
+		"BSZVINE_YELLOW",
 		1464,           // doomednum
 		S_BSZVINE_YELLOW, // spawnstate
 		1000,           // spawnhealth
@@ -16500,7 +16500,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZVINE_ORANGE",
+		"BSZVINE_ORANGE",
 		1465,           // doomednum
 		S_BSZVINE_ORANGE, // spawnstate
 		1000,           // spawnhealth
@@ -16528,7 +16528,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZSHRUB",
+		"BSZSHRUB",
 		1470,           // doomednum
 		S_BSZSHRUB,     // spawnstate
 		1000,           // spawnhealth
@@ -16556,7 +16556,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BSZCLOVER",
+		"BSZCLOVER",
 		1471,           // doomednum
 		S_BSZCLOVER,    // spawnstate
 		1000,           // spawnhealth
@@ -16584,7 +16584,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BIG_PALMTREE_TRUNK",
+		"BIG_PALMTREE_TRUNK",
 		-1,             // doomednum
 		S_BIG_PALMTREE_TRUNK, // spawnstate
 		1000,           // spawnhealth
@@ -16612,7 +16612,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BIG_PALMTREE_TOP",
+		"BIG_PALMTREE_TOP",
 		1473,           // doomednum
 		S_BIG_PALMTREE_TOP, // spawnstate
 		1000,           // spawnhealth
@@ -16640,7 +16640,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PALMTREE_TRUNK",
+		"PALMTREE_TRUNK",
 		-1,             // doomednum
 		S_PALMTREE_TRUNK, // spawnstate
 		1000,           // spawnhealth
@@ -16668,7 +16668,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PALMTREE_TOP",
+		"PALMTREE_TOP",
 		1475,           // doomednum
 		S_PALMTREE_TOP, // spawnstate
 		1000,           // spawnhealth
@@ -16696,7 +16696,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DBALL",
+		"DBALL",
 		1875,           // doomednum
 		S_DBALL1,       // spawnstate
 		1000,           // spawnhealth
@@ -16724,7 +16724,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGSTATUE2",
+		"EGGSTATUE2",
 		1876,           // doomednum
 		S_EGGSTATUE2,   // spawnstate
 		1000,           // spawnhealth
@@ -16752,7 +16752,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ELEMENTAL_ORB",
+		"ELEMENTAL_ORB",
 		-1,             // doomednum
 		S_ELEM1,        // spawnstate
 		1000,           // spawnhealth
@@ -16780,7 +16780,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ATTRACT_ORB",
+		"ATTRACT_ORB",
 		-1,             // doomednum
 		S_MAGN1,        // spawnstate
 		1000,           // spawnhealth
@@ -16808,7 +16808,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FORCE_ORB",
+		"FORCE_ORB",
 		-1,             // doomednum
 		S_FORC1,        // spawnstate
 		1000,           // spawnhealth
@@ -16836,7 +16836,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ARMAGEDDON_ORB",
+		"ARMAGEDDON_ORB",
 		-1,             // doomednum
 		S_ARMA1,        // spawnstate
 		1000,           // spawnhealth
@@ -16864,7 +16864,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WHIRLWIND_ORB",
+		"WHIRLWIND_ORB",
 		-1,             // doomednum
 		S_WIND1,        // spawnstate
 		1000,           // spawnhealth
@@ -16892,7 +16892,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PITY_ORB",
+		"PITY_ORB",
 		-1,             // doomednum
 		S_PITY1,        // spawnstate
 		1000,           // spawnhealth
@@ -16920,7 +16920,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLAMEAURA_ORB",
+		"FLAMEAURA_ORB",
 		-1,             // doomednum
 		S_FIRSB1,       // spawnstate
 		1000,           // spawnhealth
@@ -16948,7 +16948,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BUBBLEWRAP_ORB",
+		"BUBBLEWRAP_ORB",
 		-1,             // doomednum
 		S_BUBSB1,       // spawnstate
 		1000,           // spawnhealth
@@ -16976,7 +16976,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THUNDERCOIN_ORB",
+		"THUNDERCOIN_ORB",
 		-1,             // doomednum
 		S_ZAPSB1,       // spawnstate
 		1000,           // spawnhealth
@@ -17004,7 +17004,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THUNDERCOIN_SPARK",
+		"THUNDERCOIN_SPARK",
 		-1,             // doomednum
 		S_THUNDERCOIN_SPARK, // spawnstate
 		1,              // spawnhealth
@@ -17032,7 +17032,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_IVSP",
+		"IVSP",
 		-1,             // doomednum
 		S_IVSP,         // spawnstate
 		1000,           // spawnhealth
@@ -17060,7 +17060,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SUPERSPARK",
+		"SUPERSPARK",
 		-1,             // doomednum
 		S_SSPK1,        // spawnstate
 		1,              // spawnhealth
@@ -17089,7 +17089,7 @@ static const mobjinfo_t startmobjinfo[] =
 
 	// Bluebird
 	{
-		"MT_FLICKY_01",
+		"FLICKY_01",
 		-1,             // doomednum
 		S_FLICKY_01_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17117,7 +17117,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_01_CENTER",
+		"FLICKY_01_CENTER",
 		2200,             // doomednum
 		S_FLICKY_01_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17145,7 +17145,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_02",
+		"FLICKY_02",
 		-1,             // doomednum
 		S_FLICKY_02_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17173,7 +17173,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_02_CENTER",
+		"FLICKY_02_CENTER",
 		2201,             // doomednum
 		S_FLICKY_02_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17201,7 +17201,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_03",
+		"FLICKY_03",
 		-1,             // doomednum
 		S_FLICKY_03_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17229,7 +17229,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_03_CENTER",
+		"FLICKY_03_CENTER",
 		2202,             // doomednum
 		S_FLICKY_03_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17257,7 +17257,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_04",
+		"FLICKY_04",
 		-1,             // doomednum
 		S_FLICKY_04_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17285,7 +17285,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_04_CENTER",
+		"FLICKY_04_CENTER",
 		2203,             // doomednum
 		S_FLICKY_04_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17313,7 +17313,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_05",
+		"FLICKY_05",
 		-1,             // doomednum
 		S_FLICKY_05_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17341,7 +17341,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_05_CENTER",
+		"FLICKY_05_CENTER",
 		2204,             // doomednum
 		S_FLICKY_05_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17369,7 +17369,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_06",
+		"FLICKY_06",
 		-1,             // doomednum
 		S_FLICKY_06_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17397,7 +17397,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_06_CENTER",
+		"FLICKY_06_CENTER",
 		2205,             // doomednum
 		S_FLICKY_06_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17425,7 +17425,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_07",
+		"FLICKY_07",
 		-1,             // doomednum
 		S_FLICKY_07_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17453,7 +17453,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_07_CENTER",
+		"FLICKY_07_CENTER",
 		2206,             // doomednum
 		S_FLICKY_07_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17481,7 +17481,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_08",
+		"FLICKY_08",
 		-1,             // doomednum
 		S_FLICKY_08_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17509,7 +17509,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_08_CENTER",
+		"FLICKY_08_CENTER",
 		2207,             // doomednum
 		S_FLICKY_08_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17537,7 +17537,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_09",
+		"FLICKY_09",
 		-1,             // doomednum
 		S_FLICKY_09_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17565,7 +17565,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_09_CENTER",
+		"FLICKY_09_CENTER",
 		2208,             // doomednum
 		S_FLICKY_09_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17593,7 +17593,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_10",
+		"FLICKY_10",
 		-1,             // doomednum
 		S_FLICKY_10_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17621,7 +17621,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_10_CENTER",
+		"FLICKY_10_CENTER",
 		2209,             // doomednum
 		S_FLICKY_10_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17649,7 +17649,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_11",
+		"FLICKY_11",
 		-1,             // doomednum
 		S_FLICKY_11_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17677,7 +17677,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_11_CENTER",
+		"FLICKY_11_CENTER",
 		2210,             // doomednum
 		S_FLICKY_11_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17705,7 +17705,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_12",
+		"FLICKY_12",
 		-1,             // doomednum
 		S_FLICKY_12_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17733,7 +17733,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_12_CENTER",
+		"FLICKY_12_CENTER",
 		2211,             // doomednum
 		S_FLICKY_12_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17761,7 +17761,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_13",
+		"FLICKY_13",
 		-1,             // doomednum
 		S_FLICKY_13_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17789,7 +17789,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_13_CENTER",
+		"FLICKY_13_CENTER",
 		2212,             // doomednum
 		S_FLICKY_13_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17817,7 +17817,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_14",
+		"FLICKY_14",
 		-1,             // doomednum
 		S_FLICKY_14_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17845,7 +17845,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_14_CENTER",
+		"FLICKY_14_CENTER",
 		2213,             // doomednum
 		S_FLICKY_14_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17873,7 +17873,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_15",
+		"FLICKY_15",
 		-1,             // doomednum
 		S_FLICKY_15_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17901,7 +17901,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_15_CENTER",
+		"FLICKY_15_CENTER",
 		2214,             // doomednum
 		S_FLICKY_15_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17929,7 +17929,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_16",
+		"FLICKY_16",
 		-1,             // doomednum
 		S_FLICKY_16_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -17957,7 +17957,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLICKY_16_CENTER",
+		"FLICKY_16_CENTER",
 		2215,             // doomednum
 		S_FLICKY_16_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -17985,7 +17985,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SECRETFLICKY_01",
+		"SECRETFLICKY_01",
 		-1,             // doomednum
 		S_SECRETFLICKY_01_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -18013,7 +18013,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SECRETFLICKY_01_CENTER",
+		"SECRETFLICKY_01_CENTER",
 		2216,             // doomednum
 		S_SECRETFLICKY_01_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -18041,7 +18041,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SECRETFLICKY_02",
+		"SECRETFLICKY_02",
 		-1,             // doomednum
 		S_SECRETFLICKY_02_OUT, // spawnstate
 		1000,           // spawnhealth
@@ -18069,7 +18069,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SECRETFLICKY_02_CENTER",
+		"SECRETFLICKY_02_CENTER",
 		2217,             // doomednum
 		S_SECRETFLICKY_02_CENTER, // spawnstate
 		1000,           // spawnhealth
@@ -18097,7 +18097,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SEED",
+		"SEED",
 		-1,             // doomednum
 		S_SEED,         // spawnstate
 		1000,           // spawnhealth
@@ -18125,7 +18125,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_RAIN",
+		"RAIN",
 		-1,             // doomednum
 		S_RAIN1,        // spawnstate
 		1000,           // spawnhealth
@@ -18153,7 +18153,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SNOWFLAKE",
+		"SNOWFLAKE",
 		-1,             // doomednum
 		S_SNOW1,        // spawnstate
 		1000,           // spawnhealth
@@ -18181,7 +18181,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPLISH",
+		"SPLISH",
 		-1,             // doomednum
 		S_SPLISH1,      // spawnstate
 		1000,           // spawnhealth
@@ -18209,7 +18209,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LAVASPLISH",
+		"LAVASPLISH",
 		-1,             // doomednum
 		S_LAVASPLISH,   // spawnstate
 		1000,           // spawnhealth
@@ -18237,7 +18237,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SMOKE",
+		"SMOKE",
 		-1,             // doomednum
 		S_SMOKE1,       // spawnstate
 		1000,           // spawnhealth
@@ -18265,7 +18265,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SMALLBUBBLE",
+		"SMALLBUBBLE",
 		-1,             // doomednum
 		S_SMALLBUBBLE,  // spawnstate
 		1000,           // spawnhealth
@@ -18293,7 +18293,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MEDIUMBUBBLE",
+		"MEDIUMBUBBLE",
 		-1,             // doomednum
 		S_MEDIUMBUBBLE, // spawnstate
 		1000,           // spawnhealth
@@ -18321,7 +18321,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EXTRALARGEBUBBLE",
+		"EXTRALARGEBUBBLE",
 		-1,             // doomednum
 		S_LARGEBUBBLE1, // spawnstate
 		1000,           // spawnhealth
@@ -18349,7 +18349,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WATERZAP",
+		"WATERZAP",
 		-1,             // doomednum
 		S_WATERZAP,     // spawnstate
 		1000,           // spawnhealth
@@ -18377,7 +18377,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPINDUST",
+		"SPINDUST",
 		-1,             // doomednum
 		S_SPINDUST1,     // spawnstate
 		1000,           // spawnhealth
@@ -18405,7 +18405,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TFOG",
+		"TFOG",
 		-1,             // doomednum
 		S_FOG1,         // spawnstate
 		1,              // spawnhealth
@@ -18433,7 +18433,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PARTICLE",
+		"PARTICLE",
 		-1,             // doomednum
 		S_PARTICLE,     // spawnstate
 		1000,           // spawnhealth
@@ -18461,7 +18461,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PARTICLEGEN",
+		"PARTICLEGEN",
 		757,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -18489,7 +18489,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SCORE",
+		"SCORE",
 		-1,             // doomednum
 		S_SCRA,         // spawnstate
 		1,              // spawnhealth
@@ -18517,7 +18517,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DROWNNUMBERS",
+		"DROWNNUMBERS",
 		-1,             // doomednum
 		S_ZERO1,        // spawnstate
 		1000,           // spawnhealth
@@ -18545,7 +18545,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GOTEMERALD",
+		"GOTEMERALD",
 		-1,             // doomednum
 		S_CEMG1,        // spawnstate
 		1000,           // spawnhealth
@@ -18573,7 +18573,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LOCKON",
+		"LOCKON",
 		-1,             // doomednum
 		S_LOCKON1,       // spawnstate
 		1000,           // spawnhealth
@@ -18601,7 +18601,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LOCKONINF",
+		"LOCKONINF",
 		1126,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -18629,7 +18629,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TAG",
+		"TAG",
 		-1,             // doomednum
 		S_TTAG,         // spawnstate
 		1000,           // spawnhealth
@@ -18657,7 +18657,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GOTFLAG",
+		"GOTFLAG",
 		-1,             // doomednum
 		S_GOTFLAG,      // spawnstate
 		1000,           // spawnhealth
@@ -18685,7 +18685,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FINISHFLAG",
+		"FINISHFLAG",
 		-1,             // doomednum
 		S_FINISHFLAG,   // spawnstate
 		1000,           // spawnhealth
@@ -18714,7 +18714,7 @@ static const mobjinfo_t startmobjinfo[] =
 
 	// ambient sound effect
 	{
-		"MT_AMBIENT",
+		"AMBIENT",
 		700,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -18742,7 +18742,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CORK",
+		"CORK",
 		-1,             // doomednum
 		S_CORK,         // spawnstate
 		1000,           // spawnhealth
@@ -18770,7 +18770,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_LHRT",
+		"LHRT",
 		-1,             // doomednum
 		S_LHRT,         // spawnstate
 		1000,           // spawnhealth
@@ -18798,7 +18798,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_REDRING",
+		"REDRING",
 		-1,             // doomednum
 		S_RRNG1,        // spawnstate
 		1000,           // spawnhealth
@@ -18827,7 +18827,7 @@ static const mobjinfo_t startmobjinfo[] =
 
 // Ring ammo: Health = amount given
 	{
-		"MT_BOUNCERING",
+		"BOUNCERING",
 		301,            // doomednum
 		S_BOUNCERINGAMMO, // spawnstate
 		10,             // spawnhealth
@@ -18855,7 +18855,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_RAILRING",
+		"RAILRING",
 		302,            // doomednum
 		S_RAILRINGAMMO, // spawnstate
 		5,              // spawnhealth
@@ -18883,7 +18883,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_INFINITYRING",
+		"INFINITYRING",
 		303,            // doomednum
 		S_INFINITYRINGAMMO,// spawnstate
 		80,             // spawnhealth
@@ -18911,7 +18911,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_AUTOMATICRING",
+		"AUTOMATICRING",
 		304,            // doomednum
 		S_AUTOMATICRINGAMMO, // spawnstate
 		40,             // spawnhealth
@@ -18939,7 +18939,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EXPLOSIONRING",
+		"EXPLOSIONRING",
 		305,            // doomednum
 		S_EXPLOSIONRINGAMMO, // spawnstate
 		5,              // spawnhealth
@@ -18967,7 +18967,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SCATTERRING",
+		"SCATTERRING",
 		306,            // doomednum
 		S_SCATTERRINGAMMO, // spawnstate
 		5,              // spawnhealth
@@ -18995,7 +18995,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GRENADERING",
+		"GRENADERING",
 		307,            // doomednum
 		S_GRENADERINGAMMO, // spawnstate
 		10,             // spawnhealth
@@ -19024,7 +19024,7 @@ static const mobjinfo_t startmobjinfo[] =
 
 // Ring panels: Reactiontime = amount given
 	{
-		"MT_BOUNCEPICKUP",
+		"BOUNCEPICKUP",
 		330,            // doomednum
 		S_BOUNCEPICKUP, // spawnstate
 		1,              // spawnhealth
@@ -19052,7 +19052,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_RAILPICKUP",
+		"RAILPICKUP",
 		331,            // doomednum
 		S_RAILPICKUP,   // spawnstate
 		1,              // spawnhealth
@@ -19080,7 +19080,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_AUTOPICKUP",
+		"AUTOPICKUP",
 		332,            // doomednum
 		S_AUTOPICKUP,   // spawnstate
 		1,              // spawnhealth
@@ -19108,7 +19108,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EXPLODEPICKUP",
+		"EXPLODEPICKUP",
 		333,            // doomednum
 		S_EXPLODEPICKUP,// spawnstate
 		1,              // spawnhealth
@@ -19136,7 +19136,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SCATTERPICKUP",
+		"SCATTERPICKUP",
 		334,            // doomednum
 		S_SCATTERPICKUP,// spawnstate
 		1,              // spawnhealth
@@ -19164,7 +19164,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GRENADEPICKUP",
+		"GRENADEPICKUP",
 		335,            // doomednum
 		S_GRENADEPICKUP,// spawnstate
 		1,              // spawnhealth
@@ -19192,7 +19192,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THROWNBOUNCE",
+		"THROWNBOUNCE",
 		-1,             // doomednum
 		S_THROWNBOUNCE1,// spawnstate
 		1000,           // spawnhealth
@@ -19220,7 +19220,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THROWNINFINITY",
+		"THROWNINFINITY",
 		-1,             // doomednum
 		S_THROWNINFINITY1, // spawnstate
 		1000,           // spawnhealth
@@ -19248,7 +19248,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THROWNAUTOMATIC",
+		"THROWNAUTOMATIC",
 		-1,             // doomednum
 		S_THROWNAUTOMATIC1, // spawnstate
 		1000,           // spawnhealth
@@ -19276,7 +19276,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THROWNSCATTER",
+		"THROWNSCATTER",
 		-1,             // doomednum
 		S_THROWNSCATTER,// spawnstate
 		1000,           // spawnhealth
@@ -19304,7 +19304,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THROWNEXPLOSION",
+		"THROWNEXPLOSION",
 		-1,             // doomednum
 		S_THROWNEXPLOSION1, // spawnstate
 		1000,           // spawnhealth
@@ -19332,7 +19332,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_THROWNGRENADE",
+		"THROWNGRENADE",
 		-1,             // doomednum
 		S_THROWNGRENADE1, // spawnstate
 		1000,           // spawnhealth
@@ -19360,7 +19360,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_COIN",
+		"COIN",
 		1800,           // doomednum
 		S_COIN1,        // spawnstate
 		1000,           // spawnhealth
@@ -19388,7 +19388,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLINGCOIN",
+		"FLINGCOIN",
 		-1,             // doomednum
 		S_COIN1,        // spawnstate
 		1000,           // spawnhealth
@@ -19416,7 +19416,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GOOMBA",
+		"GOOMBA",
 		1801,           // doomednum
 		S_GOOMBA1,      // spawnstate
 		1,              // spawnhealth
@@ -19444,7 +19444,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUEGOOMBA",
+		"BLUEGOOMBA",
 		1802,              // doomednum
 		S_BLUEGOOMBA1,     // spawnstate
 		1,                 // spawnhealth
@@ -19472,7 +19472,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FIREFLOWER",
+		"FIREFLOWER",
 		1803,           // doomednum
 		S_FIREFLOWER1,  // spawnstate
 		1000,           // spawnhealth
@@ -19500,7 +19500,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FIREBALL",
+		"FIREBALL",
 		-1,             // doomednum
 		S_FIREBALL,     // spawnstate
 		1000,           // spawnhealth
@@ -19528,7 +19528,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FIREBALLTRAIL",
+		"FIREBALLTRAIL",
 		-1,                  // doomednum
 		S_FIREBALLTRAIL1,    // spawnstate
 		1000,                // spawnhealth
@@ -19556,7 +19556,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SHELL",
+		"SHELL",
 		1804,           // doomednum
 		S_SHELL,        // spawnstate
 		1,              // spawnhealth
@@ -19584,7 +19584,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PUMA",
+		"PUMA",
 		1805,           // doomednum
 		S_PUMA_START1,  // spawnstate
 		1000,           // spawnhealth
@@ -19612,7 +19612,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PUMATRAIL",
+		"PUMATRAIL",
 		-1,             // doomednum
 		S_PUMATRAIL1,   // spawnstate
 		1000,           // spawnhealth
@@ -19640,7 +19640,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HAMMER",
+		"HAMMER",
 		-1,             // doomednum
 		S_HAMMER,      // spawnstate
 		1000,           // spawnhealth
@@ -19667,7 +19667,7 @@ static const mobjinfo_t startmobjinfo[] =
 		S_NULL          // raisestate
 	},
 	{
-		"MT_KOOPA",
+		"KOOPA",
 		1806,           // doomednum
 		S_KOOPA1,       // spawnstate
 		1000,           // spawnhealth
@@ -19695,7 +19695,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_KOOPAFLAME",
+		"KOOPAFLAME",
 		-1,             // doomednum
 		S_KOOPAFLAME1,  // spawnstate
 		1000,           // spawnhealth
@@ -19723,7 +19723,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_AXE",
+		"AXE",
 		1807,           // doomednum
 		S_AXE1,         // spawnstate
 		1000,           // spawnhealth
@@ -19751,7 +19751,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MARIOBUSH1",
+		"MARIOBUSH1",
 		1808,           // doomednum
 		S_MARIOBUSH1,   // spawnstate
 		1000,           // spawnhealth
@@ -19779,7 +19779,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_MARIOBUSH2",
+		"MARIOBUSH2",
 		1809,           // doomednum
 		S_MARIOBUSH2,   // spawnstate
 		1000,           // spawnhealth
@@ -19807,7 +19807,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TOAD",
+		"TOAD",
 		1810,           // doomednum
 		S_TOAD,         // spawnstate
 		1000,           // spawnhealth
@@ -19835,7 +19835,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_AXIS",
+		"AXIS",
 		1700,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -19863,7 +19863,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_AXISTRANSFER",
+		"AXISTRANSFER",
 		1701,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -19891,7 +19891,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_AXISTRANSFERLINE",
+		"AXISTRANSFERLINE",
 		1702,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -19919,7 +19919,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSDRONE",
+		"NIGHTSDRONE",
 		1703,           // doomednum
 		S_INVISIBLE,  // spawnstate
 		120,            // spawnhealth
@@ -19947,7 +19947,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSDRONE_MAN",
+		"NIGHTSDRONE_MAN",
 		-1,           // doomednum
 		S_INVISIBLE,  // spawnstate
 		120,            // spawnhealth
@@ -19975,7 +19975,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSDRONE_SPARKLING",
+		"NIGHTSDRONE_SPARKLING",
 		-1,             // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -20003,7 +20003,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSDRONE_GOAL",
+		"NIGHTSDRONE_GOAL",
 		-1,             // doomednum
 		S_INVISIBLE,   // spawnstate
 		1000,           // spawnhealth
@@ -20031,7 +20031,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSPARKLE",
+		"NIGHTSPARKLE",
 		-1,             // doomednum
 		S_NIGHTSPARKLE1,// spawnstate
 		1000,           // spawnhealth
@@ -20059,7 +20059,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSLOOPHELPER",
+		"NIGHTSLOOPHELPER",
 		-1,             // doomednum
 		S_NIGHTSLOOPHELPER,// spawnstate
 		1000,           // spawnhealth
@@ -20087,7 +20087,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSBUMPER",
+		"NIGHTSBUMPER",
 		1704,           // doomednum
 		S_NIGHTSBUMPER1,// spawnstate
 		1,              // spawnhealth
@@ -20115,7 +20115,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HOOP",
+		"HOOP",
 		-1,             // doomednum
 		S_HOOP,         // spawnstate
 		1000,           // spawnhealth
@@ -20143,7 +20143,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HOOPCOLLIDE",
+		"HOOPCOLLIDE",
 		-1,             // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -20171,7 +20171,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HOOPCENTER",
+		"HOOPCENTER",
 		-1,             // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -20199,7 +20199,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSCORE",
+		"NIGHTSCORE",
 		-1,             // doomednum
 		S_NIGHTSCORE10, // spawnstate
 		1000,           // spawnhealth
@@ -20227,7 +20227,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSCHIP",
+		"NIGHTSCHIP",
 		-1,             // doomednum
 		S_NIGHTSCHIP,   // spawnstate
 		1000,           // spawnhealth
@@ -20255,7 +20255,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLINGNIGHTSCHIP",
+		"FLINGNIGHTSCHIP",
 		-1,             // doomednum
 		S_NIGHTSCHIP,   // spawnstate
 		1000,           // spawnhealth
@@ -20283,7 +20283,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSSTAR",
+		"NIGHTSSTAR",
 		-1,             // doomednum
 		S_NIGHTSSTAR,   // spawnstate
 		1000,           // spawnhealth
@@ -20311,7 +20311,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FLINGNIGHTSSTAR",
+		"FLINGNIGHTSSTAR",
 		-1,             // doomednum
 		S_NIGHTSSTAR,   // spawnstate
 		1000,           // spawnhealth
@@ -20339,7 +20339,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSSUPERLOOP",
+		"NIGHTSSUPERLOOP",
 		1707,           // doomednum
 		S_NIGHTSSUPERLOOP, // spawnstate
 		1000,           // spawnhealth
@@ -20367,7 +20367,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSDRILLREFILL",
+		"NIGHTSDRILLREFILL",
 		1708,           // doomednum
 		S_NIGHTSDRILLREFILL, // spawnstate
 		1000,           // spawnhealth
@@ -20395,7 +20395,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSHELPER",
+		"NIGHTSHELPER",
 		1709,           // doomednum
 		S_NIGHTSHELPER, // spawnstate
 		1000,           // spawnhealth
@@ -20423,7 +20423,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSEXTRATIME",
+		"NIGHTSEXTRATIME",
 		1711,           // doomednum
 		S_NIGHTSEXTRATIME, // spawnstate
 		1000,           // spawnhealth
@@ -20451,7 +20451,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTSLINKFREEZE",
+		"NIGHTSLINKFREEZE",
 		1712,           // doomednum
 		S_NIGHTSLINKFREEZE, // spawnstate
 		1000,           // spawnhealth
@@ -20479,7 +20479,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EGGCAPSULE",
+		"EGGCAPSULE",
 		1710,           // doomednum
 		S_EGGCAPSULE,   // spawnstate
 		20,             // spawnhealth
@@ -20507,7 +20507,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_IDEYAANCHOR",
+		"IDEYAANCHOR",
 		1714,           // doomednum
 		S_INVISIBLE,    // spawnstate
 		0,              // spawnhealth
@@ -20535,7 +20535,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NIGHTOPIANHELPER",
+		"NIGHTOPIANHELPER",
 		-1,             // doomednum
 		S_NIGHTOPIANHELPER1, // spawnstate
 		1000,           // spawnhealth
@@ -20563,7 +20563,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PIAN",
+		"PIAN",
 		1602,           // doomednum
 		S_PIAN_LOOK1,   // spawnstate
 		1000,           // spawnhealth
@@ -20591,7 +20591,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SHLEEP",
+		"SHLEEP",
 		1601,           // doomednum
 		S_SHLEEP1,      // spawnstate
 		1,              // spawnhealth
@@ -20619,7 +20619,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_PENGUINATOR",
+		"PENGUINATOR",
 		129,            // doomednum
 		S_PENGUINATOR_LOOK, // spawnstate
 		1,              // spawnhealth
@@ -20647,7 +20647,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_POPHAT",
+		"POPHAT",
 		130,            // doomednum -- happy anniversary!
 		S_POPHAT_LOOK,  // spawnstate
 		1,              // spawnhealth
@@ -20675,7 +20675,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_POPSHOT",
+		"POPSHOT",
 		-1,             // doomednum
 		S_POPSHOT,      // spawnstate
 		1,              // spawnhealth
@@ -20703,7 +20703,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_POPSHOT_TRAIL",
+		"POPSHOT_TRAIL",
 		-1,             // doomednum
 		S_POPSHOT_TRAIL,// spawnstate
 		1000,           // spawnhealth
@@ -20731,7 +20731,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HIVEELEMENTAL",
+		"HIVEELEMENTAL",
 		127,            // doomednum
 		S_HIVEELEMENTAL_LOOK, // spawnstate
 		2,              // spawnhealth
@@ -20759,7 +20759,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BUMBLEBORE",
+		"BUMBLEBORE",
 		128,			// doomednum
 		S_BUMBLEBORE_SPAWN, // spawnstate
 		0,              // spawnhealth -- this is how you do drones...
@@ -20787,7 +20787,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BUGGLE",
+		"BUGGLE",
 		124,            // doomednum
 		S_BUGGLEIDLE,   // spawnstate
 		1,              // spawnhealth
@@ -20815,7 +20815,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SMASHINGSPIKEBALL",
+		"SMASHINGSPIKEBALL",
 		2000,           // doomednum
 		S_SMASHSPIKE_FLOAT, // spawnstate
 		1000,           // spawnhealth
@@ -20843,7 +20843,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACOLANTERN",
+		"CACOLANTERN",
 		132,            // doomednum
 		S_CACO_LOOK,    // spawnstate
 		1,              // spawnhealth
@@ -20871,7 +20871,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACOSHARD",
+		"CACOSHARD",
 		-1,             // doomednum
 		S_CACOSHARD_RANDOMIZE, // spawnstate
 		1000,           // spawnhealth
@@ -20899,7 +20899,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CACOFIRE",
+		"CACOFIRE",
 		-1,             // doomednum
 		S_CACOFIRE1,    // spawnstate
 		1000,           // spawnhealth
@@ -20927,7 +20927,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPINBOBERT",
+		"SPINBOBERT",
 		131,            // doomednum
 		S_SPINBOBERT_MOVE_FLIPUP, // spawnstate
 		1,              // spawnhealth
@@ -20955,7 +20955,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPINBOBERT_FIRE1",
+		"SPINBOBERT_FIRE1",
 		-1,             // doomednum
 		S_SPINBOBERT_FIRE_MOVE, // spawnstate
 		1,              // spawnhealth
@@ -20983,7 +20983,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPINBOBERT_FIRE2",
+		"SPINBOBERT_FIRE2",
 		-1,             // doomednum
 		S_SPINBOBERT_FIRE_MOVE, // spawnstate
 		1,              // spawnhealth
@@ -21011,7 +21011,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_HANGSTER",
+		"HANGSTER",
 		133,            // doomednum
 		S_HANGSTER_LOOK, // spawnstate
 		1,              // spawnhealth
@@ -21039,7 +21039,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_TELEPORTMAN",
+		"TELEPORTMAN",
 		751,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -21067,7 +21067,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ALTVIEWMAN",
+		"ALTVIEWMAN",
 		752,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -21095,7 +21095,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_CRUMBLEOBJ",
+		"CRUMBLEOBJ",
 		-1,             // doomednum
 		S_CRUMBLE1,     // spawnstate
 		1000,           // spawnhealth
@@ -21124,7 +21124,7 @@ static const mobjinfo_t startmobjinfo[] =
 
 	// Waypoint for zoom tubes
 	{
-		"MT_TUBEWAYPOINT",
+		"TUBEWAYPOINT",
 		753,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -21153,7 +21153,7 @@ static const mobjinfo_t startmobjinfo[] =
 
 	// for use with wind and current effects
 	{
-		"MT_PUSH",
+		"PUSH",
 		754,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -21181,7 +21181,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GHOST",
+		"GHOST",
 		-1,             // doomednum
 		S_THOK,         // spawnstate
 		1,              // spawnhealth
@@ -21209,7 +21209,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_OVERLAY",
+		"OVERLAY",
 		-1,             // doomednum
 		S_NULL,         // spawnstate
 		1,              // spawnhealth
@@ -21237,7 +21237,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ANGLEMAN",
+		"ANGLEMAN",
 		758,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -21265,7 +21265,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_POLYANCHOR",
+		"POLYANCHOR",
 		760,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -21293,7 +21293,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_POLYSPAWN",
+		"POLYSPAWN",
 		761,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1,              // spawnhealth
@@ -21321,7 +21321,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SKYBOX",
+		"SKYBOX",
 		780,            // doomednum
 		S_INVISIBLE,    // spawnstate
 		1000,           // spawnhealth
@@ -21349,7 +21349,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_SPARK",
+		"SPARK",
 		-1,             // doomednum
 		S_SPRK1,        // spawnstate
 		1000,           // spawnhealth
@@ -21377,7 +21377,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_EXPLODE",
+		"EXPLODE",
 		-1,             // doomednum
 		S_XPLD1,        // spawnstate
 		1,              // spawnhealth
@@ -21405,7 +21405,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_UWEXPLODE",
+		"UWEXPLODE",
 		-1,             // doomednum
 		S_WPLD1,        // spawnstate
 		1,              // spawnhealth
@@ -21433,7 +21433,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_DUST",
+		"DUST",
 		-1,             // doomednum
 		S_DUST1,     // spawnstate
 		1000,           // spawnhealth
@@ -21461,7 +21461,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKSPAWNER",
+		"ROCKSPAWNER",
 		1202,           // doomednum
 		S_ROCKSPAWN,    // spawnstate
 		1000,           // spawnhealth
@@ -21489,7 +21489,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_FALLINGROCK",
+		"FALLINGROCK",
 		-1,             // doomednum
 		S_ROCKCRUMBLEA, // spawnstate
 		1000,           // spawnhealth
@@ -21517,7 +21517,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE1",
+		"ROCKCRUMBLE1",
 		-1,             // doomednum
 		S_ROCKCRUMBLEA, // spawnstate
 		1000,           // spawnhealth
@@ -21545,7 +21545,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE2",
+		"ROCKCRUMBLE2",
 		-1,             // doomednum
 		S_ROCKCRUMBLEB, // spawnstate
 		1000,           // spawnhealth
@@ -21573,7 +21573,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE3",
+		"ROCKCRUMBLE3",
 		-1,             // doomednum
 		S_ROCKCRUMBLEC, //spawnstate
 		1000,           // spawnhealth
@@ -21601,7 +21601,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE4",
+		"ROCKCRUMBLE4",
 		-1,             // doomednum
 		S_ROCKCRUMBLED, // spawnstate
 		1000,           // spawnhealth
@@ -21629,7 +21629,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE5",
+		"ROCKCRUMBLE5",
 		-1,             // doomednum
 		S_ROCKCRUMBLEE, // spawnstate
 		1000,           // spawnhealth
@@ -21657,7 +21657,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE6",
+		"ROCKCRUMBLE6",
 		-1,             // doomednum
 		S_ROCKCRUMBLEF, // spawnstate
 		1000,           // spawnhealth
@@ -21685,7 +21685,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE7",
+		"ROCKCRUMBLE7",
 		-1,             // doomednum
 		S_ROCKCRUMBLEG, // spawnstate
 		1000,           // spawnhealth
@@ -21713,7 +21713,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE8",
+		"ROCKCRUMBLE8",
 		-1,             // doomednum
 		S_ROCKCRUMBLEH, // spawnstate
 		1000,           // spawnhealth
@@ -21741,7 +21741,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE9",
+		"ROCKCRUMBLE9",
 		-1,             // doomednum
 		S_ROCKCRUMBLEI, // spawnstate
 		1000,           // spawnhealth
@@ -21769,7 +21769,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE10",
+		"ROCKCRUMBLE10",
 		-1,             // doomednum
 		S_ROCKCRUMBLEJ, // spawnstate
 		1000,           // spawnhealth
@@ -21797,7 +21797,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE11",
+		"ROCKCRUMBLE11",
 		-1,             // doomednum
 		S_ROCKCRUMBLEK, // spawnstate
 		1000,           // spawnhealth
@@ -21825,7 +21825,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE12",
+		"ROCKCRUMBLE12",
 		-1,             // doomednum
 		S_ROCKCRUMBLEL, // spawnstate
 		1000,           // spawnhealth
@@ -21853,7 +21853,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE13",
+		"ROCKCRUMBLE13",
 		-1,             // doomednum
 		S_ROCKCRUMBLEM, // spawnstate
 		1000,           // spawnhealth
@@ -21881,7 +21881,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE14",
+		"ROCKCRUMBLE14",
 		-1,             // doomednum
 		S_ROCKCRUMBLEN, // spawnstate
 		1000,           // spawnhealth
@@ -21909,7 +21909,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE15",
+		"ROCKCRUMBLE15",
 		-1,             // doomednum
 		S_ROCKCRUMBLEO, // spawnstate
 		1000,           // spawnhealth
@@ -21937,7 +21937,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_ROCKCRUMBLE16",
+		"ROCKCRUMBLE16",
 		-1,             // doomednum
 		S_ROCKCRUMBLEP, // spawnstate
 		1000,           // spawnhealth
@@ -21965,7 +21965,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_GFZDEBRIS",
+		"GFZDEBRIS",
 		-1,             // doomednum
 		S_GFZDEBRIS,    // spawnstate
 		1,              // spawnhealth
@@ -21993,7 +21993,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BRICKDEBRIS",
+		"BRICKDEBRIS",
 		-1,             // doomednum
 		S_BRICKDEBRIS,  // spawnstate
 		1,              // spawnhealth
@@ -22021,7 +22021,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_WOODDEBRIS",
+		"WOODDEBRIS",
 		-1,             // doomednum
 		S_WOODDEBRIS,   // spawnstate
 		1,              // spawnhealth
@@ -22049,7 +22049,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_REDBRICKDEBRIS",
+		"REDBRICKDEBRIS",
 		-1,             // doomednum
 		S_REDBRICKDEBRIS,    // spawnstate
 		1,              // spawnhealth
@@ -22077,7 +22077,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_BLUEBRICKDEBRIS",
+		"BLUEBRICKDEBRIS",
 		-1,             // doomednum
 		S_BLUEBRICKDEBRIS,    // spawnstate
 		1,              // spawnhealth
@@ -22105,7 +22105,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_YELLOWBRICKDEBRIS",
+		"YELLOWBRICKDEBRIS",
 		-1,             // doomednum
 		S_YELLOWBRICKDEBRIS,    // spawnstate
 		1,              // spawnhealth
@@ -22133,7 +22133,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_NAMECHECK",
+		"NAMECHECK",
 		-1,             // doomednum
 		S_NAMECHECK,    // spawnstate
 		1000,           // spawnhealth
@@ -22161,7 +22161,7 @@ static const mobjinfo_t startmobjinfo[] =
 	},
 
 	{
-		"MT_RAY",
+		"RAY",
 		-1,             // doomednum
 		S_NULL,         // spawnstate
 		0,              // spawnhealth
diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c
index 3a768dac802f0b2785484a1866eddadde489528d..cf1a9e8c8eb301a06b5837add47ab52bbfe6ae59 100644
--- a/src/lua_mobjlib.c
+++ b/src/lua_mobjlib.c
@@ -564,8 +564,13 @@ static int mobj_set(lua_State *L)
 		mo->frame = (UINT32)luaL_checkinteger(L, 3);
 		break;
 	case mobj_sprite2:
-		mo->sprite2 = P_GetSkinSprite2(((skin_t *)mo->skin), (UINT16)luaL_checkinteger(L, 3), mo->player);
+	{
+		UINT32 spr2 = luaL_checkinteger(L, 3);
+		if ((spr2 & SPR2F_MASK) >= numplayersprites)
+			return luaL_error(L, "sprite2 %d out of range (0 - %d)", spr2, numplayersprites-1);
+		mo->sprite2 = P_GetSkinSprite2(((skin_t *)mo->skin), spr2, mo->player);
 		break;
+	}
 	case mobj_anim_duration:
 		mo->anim_duration = (UINT16)luaL_checkinteger(L, 3);
 		break;