SW: fixed some bad sprite definitions and cleaned out unused data

source/common/textures/texturemanager.cpp

@@ -1624,6 +1624,22 @@ void FTextureManager::Listaliases()
 	}
 }
 
+FString FTextureManager::Listaliases(FTextureID id)
+{
+	decltype(aliases)::Iterator it(aliases);
+	decltype(aliases)::Pair* pair;
+
+	FString list;
+	while (it.NextPair(pair))
+	{
+		if (pair->Value != id.GetIndex()) continue;
+		auto tex = GetGameTexture(pair->Value);
+		if (list.IsNotEmpty()) list += ", ";
+		list += pair->Key.GetChars();
+	}
+	return list;
+}
+
 //==========================================================================
 //
 // link a texture with a given lump

source/common/textures/texturemanager.h

@@ -77,6 +77,7 @@ public:
 
 	void FlushAll();
 	void Listaliases();
+	FString Listaliases(FTextureID);
 	FTextureID GetFrontSkyLayer(FTextureID);
 	FTextureID GetRawTexture(FTextureID tex, bool dontlookup = false);
 	void SetRawTexture(FTextureID texid) 

source/core/mainloop.cpp

@@ -400,6 +400,34 @@ void DrawOverlays()
 	DrawRateStuff();
 }
 
+static void doDrawTile(const char* texname)
+{
+	auto tex = TexMan.CheckForTexture(texname, ETextureType::Any);
+	if (!tex.isValid()) tex = tileGetTextureID(atoi(texname));
+	if (tex.isValid())
+	{
+		auto tx = TexMan.GetGameTexture(tex, true);
+		if (tx)
+		{
+			int width = (int)tx->GetDisplayWidth();
+			int height = (int)tx->GetDisplayHeight();
+			int dwidth, dheight;
+			if (width > height)
+			{
+				dwidth = screen->GetWidth() / 4;
+				dheight = height * dwidth / width;
+			}
+			else
+			{
+				dheight = screen->GetHeight() / 4;
+				dwidth = width * dheight / height;
+			}
+			DrawText(twod, SmallFont, CR_CYAN, 0, 5, FStringf("Displaying %s %s", texname, TexMan.Listaliases(tex).GetChars()).GetChars(), DTA_KeepRatio, true, TAG_DONE);
+			DrawTexture(twod, tx, 0, 30, DTA_DestWidth, dwidth, DTA_DestHeight, dheight, TAG_DONE);
+		}
+	}
+
+}
 //==========================================================================
 //
 // Display
@@ -407,6 +435,22 @@ void DrawOverlays()
 //==========================================================================
 CVAR(String, drawtile, "", 0)	// debug stuff. Draws the tile with the given number on top of thze HUD
 
+CCMD(nexttile)
+{
+	do
+	{
+		*(drawtile.get()) = FStringf("#%05d", atoi(*drawtile + 1) + 1).GetChars();
+	} while (TexMan.CheckForTexture(*drawtile, ETextureType::Any).isNull());
+}
+
+CCMD(prevtile)
+{
+	do
+	{
+		*(drawtile.get()) = FStringf("#%05d", atoi(*drawtile + 1) - 1).GetChars();
+	} while (TexMan.CheckForTexture(*drawtile, ETextureType::Any).isNull());
+}
+
 void Display()
 {
 	if (screen == nullptr || (!AppActive && (screen->IsFullscreen() || !vid_activeinbackground)))
@@ -466,29 +510,7 @@ void Display()
 		DrawOverlays();
 		if (drawtile[0])
 		{
-			auto tex = TexMan.CheckForTexture(drawtile, ETextureType::Any);
+			doDrawTile(drawtile);
-			if (!tex.isValid()) tex = tileGetTextureID(atoi(drawtile));
-			if (tex.isValid())
-			{
-				auto tx = TexMan.GetGameTexture(tex, true);
-				if (tx)
-				{
-					int width = (int)tx->GetDisplayWidth();
-					int height = (int)tx->GetDisplayHeight();
-					int dwidth, dheight;
-					if (width > height)
-					{
-						dwidth = screen->GetWidth() / 4;
-						dheight = height * dwidth / width;
-					}
-					else
-					{
-						dheight = screen->GetHeight() / 4;
-						dwidth = width * dheight / height;
-					}
-					DrawTexture(twod, tx, 0, 0, DTA_DestWidth, dwidth, DTA_DestHeight, dheight, TAG_DONE);
-				}
-			}
 		}
 	}
 	else

source/core/textures/tilesetbuilder.cpp

@@ -240,6 +240,20 @@ static void GenerateRotations(int firsttileid, const char* basename, int tile, i
 			}
 		}
 	}
+	else if (order == -1)
+	{
+		for (int rotation = 0; rotation < numrotations; rotation++)
+		{
+			int oldtile = tile;
+			for (int frame = 0; frame < numframes; frame++)
+			{
+				FStringf str("%s@%c%x", basename, frame + 'A', rotation + 1);
+				TexMan.AddAlias(str.GetChars(), FSetTextureID(firsttileid + tile));
+				tile++;
+			}
+			tile -= 2 * numframes;
+		}
+	}
 }
 
 static void CompleteRotations(int firsttileid, const char* basename, const char* getname, int numframes, int numrotations)
@@ -317,7 +331,7 @@ void LoadAliases(int firsttileid, int maxarttile)
 					sc.ScriptMessage("%d: Bad number of rotations\n", numrotations);
 					continue;
 				}
-				if (order < 0)
+				if (order < -1)
 				{
 					sc.ScriptMessage("%d: Bad order\n", order);
 					continue;

source/games/sw/src/coolg.cpp

@@ -140,24 +140,6 @@ FState s_CoolgStand[] =
         {SPR_COOLG_RUN, 'A', COOLG_RUN_RATE, &AF(DoCoolgMove), &s_CoolgStand[0]},
 };
 
-//////////////////////
-//
-// COOLG CLUB
-//
-//////////////////////
-
-#define COOLG_RATE 16
-
-FState s_CoolgClub[] =
-{
-        {SPR_COOLG_CLUB, 'A', COOLG_RATE, &AF(NullCoolg), &s_CoolgClub[1]},
-        {SPR_COOLG_RUN, 'A', COOLG_RATE, &AF(NullCoolg), &s_CoolgClub[2]},
-        {SPR_COOLG_CLUB, 'B', 0|SF_QUICK_CALL, &AF(InitCoolgBash), &s_CoolgClub[3]},
-        {SPR_COOLG_CLUB, 'B', COOLG_RATE, &AF(NullCoolg), &s_CoolgClub[4]},
-        {SPR_COOLG_CLUB, 'B', 0|SF_QUICK_CALL, &AF(InitActorDecide), &s_CoolgClub[5]},
-        {SPR_COOLG_CLUB, 'B', COOLG_RATE, &AF(DoCoolgMove), &s_CoolgClub[5]}
-};
-
 //////////////////////
 //
 // COOLG FIRE
@@ -281,7 +263,6 @@ ACTOR_ACTION_SET CoolgActionSet =
     s_CoolgDead,
     nullptr,
     nullptr,
-//  {s_CoolgClub},
     {s_CoolgAttack},
     {1024},
     {s_CoolgAttack},
@@ -745,7 +726,6 @@ static saveable_data saveable_coolg_data[] =
 
     SAVE_DATA(s_CoolgRun),
     SAVE_DATA(s_CoolgStand),
-    SAVE_DATA(s_CoolgClub),
     SAVE_DATA(s_CoolgAttack),
     SAVE_DATA(s_CoolgPain),
     SAVE_DATA(s_CoolgDie),

source/games/sw/src/goro.cpp

@@ -176,7 +176,7 @@ FState s_GoroSpell[] =
 
 FState s_GoroStand[] =
 {
-        {SPR_GORO_STAND, 'A', GORO_STAND_RATE, &AF(DoGoroMove), &s_GoroStand[0]},
+        {SPR_GORO_CHOP, 'A', GORO_STAND_RATE, &AF(DoGoroMove), &s_GoroStand[0]},
 };
 
 
@@ -190,7 +190,7 @@ FState s_GoroStand[] =
 
 FState s_GoroPain[] =
 {
-        {SPR_GORO_STAND, 'A', GORO_PAIN_RATE, &AF(DoGoroPain), &s_GoroPain[0]},
+        {SPR_GORO_CHOP, 'A', GORO_PAIN_RATE, &AF(DoGoroPain), &s_GoroPain[0]},
 };
 
 

source/games/sw/src/namelist.h

@@ -6,7 +6,6 @@ x(MENU_CURSOR, 298)
 x(DART1, 2000)
 x(DART2, 2001)
 x(DART3, 2002)
-x(DART4, 2003)
 x(DART, 2004)
 x(FIRE1, 2005)
 x(FIRE2, 2006)
@@ -47,10 +46,8 @@ x(LIGHT6, 2040)
 x(ELECTRO1, 2041)
 x(ELECTRO2, 2042)
 x(ELECTRO3, 2043)
-x(RIFLE1, 2044)
 x(RIFLE2, 2045)
 x(RIFLE3, 2046)
-x(DONTUSE_EXTRA, 2047)
 x(RIFLE4, 2048)
 x(CARTRIGE3, 2053)
 x(STATUE1, 2054)
@@ -102,8 +99,6 @@ x(ICON_CLOAK, 1804)
 x(ICON_NIGHT_VISION, 3031)
 x(ICON_NAPALM, 3046)
 x(ICON_RING, 3050)
-x(ICON_GOROAMMO, 3035)
-x(ICON_HEARTAMMO, 1820)
 x(ICON_RINGAMMO, 3054)
 x(ICON_NAPALMAMMO, 3058)
 x(ICON_GRENADE, 3059)
@@ -124,7 +119,6 @@ x(STARTALPHANUM, 4608)
 x(ENDALPHANUM, 4701)
 x(STATUS_BAR, 2434)
 x(STATUS_KEYS, 2881)
-x(STATUS_NUMBERS, 2887)
 x(BORDER_TILE, 2604)
 x(BLUE_KEY, 1766)
 x(BLUE_KEY_STATUE, 1768)
@@ -764,7 +758,7 @@ x(CARD_LOCKED, 1852)
 x(CARD_UNLOCKED, 1853)
 x(BREAK_LIGHT, 443)
 x(BREAK_MUSHROOM, 666)
-x(STAR1, 2049)
+x(STAR1, 2049) // this is not a texture - just a spawn ID!
 x(CRACK, 80)
 x(BLADE4, 5011)
 x(FFIRE1, 3143)
@@ -826,18 +820,6 @@ x(BLOODYSWORD_SWING0, 4091)
 x(BLOODYSWORD_SWING1, 4092)
 x(BLOODYSWORD_SWING2, 4093)
 x(FIST2_SWING_ALT, 4058)
-x(FIST3_REST, 4060)
-x(FIST3_SWING0, 4061)
-x(FIST3_SWING1, 4062)
-x(FIST3_SWING2, 4063)
-x(BLOODYFIST3_REST, 4064)
-x(BLOODYFIST3_SWING0, 4065)
-x(BLOODYFIST3_SWING1, 4066)
-x(BLOODYFIST3_SWING2, 4067)
-x(KICK0, 4080)
-x(KICK1, 4081)
-x(BLOODYKICK0, 4082)
-x(BLOODYKICK1, 4083)
 x(STAR_REST, 2130)
 x(STAR_DOWN0, 2131)
 x(STAR_DOWN1, 2132)
@@ -894,7 +876,6 @@ x(RAIL_FIRE0, 2018)
 x(RAIL_FIRE1, 2019)
 x(HOTHEAD_REST, 2048)
 x(HOTHEAD_ATTACK, 2049)
-x(HOTHEAD_CENTER, 2327)
 x(HOTHEAD_TURN0, 2314)
 x(HOTHEAD_TURN1, 2315)
 x(HOTHEAD_TURN2, 2316)
@@ -943,5 +924,3 @@ x(ChopsOpen, 2001)
 x(ChopsClose, 2002)
 x(FIST2_REST, 4050)
 x(FIST2_SWING0, 4051)
-x(FIST2_SWING1, 4052)
-x(FIST2_SWING2, 4053)

source/games/sw/src/panel.cpp

@@ -6557,43 +6557,6 @@ PANEL_STATE ps_Fist2Swing[] =
     {SPR_FIST2_SWING_ALT, 2, /* end slide */ &AF(pFistSlideDown),    &ps_Fist2Swing[4], 0,0,0},
 };
 
-PANEL_STATE ps_Fist3Swing[] =
-{
-    {SPR_FIST3_SWING0, FIST_PAUSE_TICS+25,                    nullptr,      &ps_Fist3Swing[1], 0,0,0},
-    {SPR_FIST3_SWING1, 0, /* damage */ &AF(pFistAttack),       &ps_Fist3Swing[2], psf_QuickCall, 0,0},
-    {SPR_FIST3_SWING2, FIST_PAUSE_TICS+10,                    nullptr,      &ps_Fist3Swing[3], 0,0,0},
-    {SPR_FIST3_SWING2, FIST_MID_SLIDE_TICS+3, /* mid slide */ &AF(pFistSlideDown),    &ps_Fist3Swing[4], 0,0,0},
-
-    {SPR_FIST3_SWING2, 8, /* end slide */ &AF(pFistSlideDown),    &ps_Fist3Swing[4], 0,0,0},
-
-    {SPR_FIST3_SWING1, FIST_SLIDE_TICS+20, /* start slide */ &AF(pFistSlideR),       &ps_Fist3Swing[6], psf_Xflip, 0,0},
-    {SPR_FIST3_SWING2, 0, /* damage */ &AF(pFistAttack),       &ps_Fist3Swing[7], psf_QuickCall|psf_Xflip, 0,0},
-    {SPR_FIST3_SWING2, FIST_MID_SLIDE_TICS+3, /* mid slide */ &AF(pFistSlideDownR),   &ps_Fist3Swing[8], psf_Xflip, 0,0},
-
-    {SPR_FIST3_SWING2, 8, /* end slide */ &AF(pFistSlideDownR),   &ps_Fist3Swing[8], psf_Xflip, 0,0},
-    {SPR_FIST3_SWING2, 8, /* end slide */ nullptr,      &ps_Fist3Swing[1], psf_Xflip, 0,0},
-};
-
-#define KICK_PAUSE_TICS 40
-#define KICK_SLIDE_TICS 30
-#define KICK_MID_SLIDE_TICS 20
-
-PANEL_STATE ps_Kick[] =
-{
-    {SPR_KICK0, KICK_PAUSE_TICS,                    nullptr,     &ps_Kick[1], 0,0,0},
-    {SPR_KICK1, 0, /* damage */ &AF(pFistAttack),       &ps_Kick[2], psf_QuickCall, 0,0},
-    {SPR_KICK1, KICK_SLIDE_TICS, /* start slide */ nullptr,     &ps_Kick[3], 0,0,0},
-    {SPR_KICK1, KICK_MID_SLIDE_TICS, /* mid slide */ &AF(pFistSlideDown),    &ps_Kick[4], 0,0,0},
-
-    {SPR_KICK1, 30, /* end slide */ &AF(pFistSlideDown),    &ps_Kick[4], 0,0,0},
-
-    {SPR_KICK0, KICK_SLIDE_TICS, /* start slide */ nullptr,     &ps_Kick[6], psf_Xflip, 0,0},
-    {SPR_KICK1, 0, /* damage */ &AF(pFistAttack),       &ps_Kick[7], psf_QuickCall|psf_Xflip, 0,0},
-    {SPR_KICK1, KICK_MID_SLIDE_TICS,/* mid slide */ &AF(pFistSlideDownR),   &ps_Kick[8], psf_Xflip, 0, 0},
-
-    {SPR_KICK1, 30, /* end slide */ &AF(pFistSlideDownR),   &ps_Kick[8], psf_Xflip, 0,0},
-    {SPR_KICK1, 30, /* end slide */ nullptr,     &ps_Kick[1], psf_Xflip, 0,0},
-};
 
 PANEL_STATE ps_RetractFist[] =
 {
@@ -6746,7 +6709,7 @@ void pFistSlideDown(DPanelSprite* psp)
 
     psp->backupcoords();
 
-    if (psp->ActionState == ps_Kick || psp->PlayerP->WpnKungFuMove == 3)
+    if (psp->PlayerP->WpnKungFuMove == 3)
     {
         psp->pos.Y -= pspSinVel(psp, ang);
     }
@@ -6769,15 +6732,8 @@ void pFistSlideDown(DPanelSprite* psp)
 
                 if (RandomRange(1000) > 500)
                 {
-                    //if(RandomRange(1000) > 300)
-                    //    {
                     psp->ActionState = ps_FistSwing;
                     psp->PlayerP->WpnKungFuMove = 0;
-                    //    } else
-                    //    {
-                    //    psp->ActionState = ps_Fist3Swing;
-                    //    psp->PlayerP->WpnKungFuMove = 1;
-                    //    }
                     pSetState(psp, psp->ActionState);
 
                     psp->opos.X = psp->pos.X = FIST_XOFF;
@@ -6849,7 +6805,7 @@ void pFistSlideDownR(DPanelSprite* psp)
 
     psp->backupcoords();
 
-    if (psp->ActionState == ps_Kick || psp->PlayerP->WpnKungFuMove == 3)
+    if (psp->PlayerP->WpnKungFuMove == 3)
     {
         psp->pos.Y -= pspSinVel(psp, ang);
     }
@@ -6973,9 +6929,6 @@ void pFistRest(DPanelSprite* psp)
 
     force = !!(psp->flags & PANF_UNHIDE_SHOOT);
 
-    if (psp->ActionState == ps_Kick)
-        psp->ActionState = ps_FistSwing;
-
     // Reset move to default
     psp->PlayerP->WpnKungFuMove = 0;
 
@@ -7868,15 +7821,8 @@ static saveable_data saveable_panel_data[] =
     SAVE_DATA(ps_PresentFist2),
     SAVE_DATA(ps_Fist2Rest),
     SAVE_DATA(ps_Fist2Hide),
-    /*
-    SAVE_DATA(ps_PresentFist3),
-    SAVE_DATA(ps_Fist3Rest),
-    SAVE_DATA(ps_Fist3Hide),
-    */
     SAVE_DATA(ps_FistSwing),
     SAVE_DATA(ps_Fist2Swing),
-    SAVE_DATA(ps_Fist3Swing),
-    SAVE_DATA(ps_Kick),
     SAVE_DATA(ps_RetractFist),
 
     SAVE_DATA(ps_PanelEnvironSuit),

source/games/sw/src/save.cpp

@@ -83,8 +83,6 @@ extern bool bosswasseen[3];
 
 #define ANIM_SAVE 1
 
-extern FState s_NotRestored[];
-
 
 
 

source/games/sw/src/skel.cpp

@@ -34,6 +34,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 BEGIN_SW_NS
 
+// Not used. No sprites exist for this enemy.
+
 DECISION SkelBattle[] =
 {
     {600,   &AF(InitActorMoveCloser)         },

source/games/sw/src/spritenames.h

@@ -5,7 +5,6 @@ x(BUNNY_DIE)
 x(BUNNY_DEAD)
 
 x(COOLG_RUN)
-x(COOLG_CLUB)
 x(COOLG_FIRE)
 x(COOLG_PAIN)
 x(COOLG_DIE)
@@ -40,7 +39,6 @@ x(GIRLNINJA_DEAD_SLICED)
 
 x(GORO_RUN)
 x(GORO_CHOP)
-x(GORO_STAND)
 x(GORO_SPELL)
 x(GORO_DIE)
 x(GORO_DEAD)
@@ -218,7 +216,6 @@ x(SUMO_FART)
 x(SUMO_DIE)
 x(SUMO_DEAD)
 
-x(NOTRESTORED)
 x(SUICIDES)
 x(DEADLOWANG)
 x(BREAK_LIGHT_ANIM)
@@ -385,7 +382,6 @@ x(RAIL_FIRE0)
 x(RAIL_FIRE1)
 x(HOTHEAD_REST)
 x(HOTHEAD_ATTACK)
-x(HOTHEAD_CENTER)
 x(HOTHEAD_TURN0)
 x(HOTHEAD_TURN1)
 x(HOTHEAD_TURN2)
@@ -437,18 +433,6 @@ x(BLOODYFIST_SWING1)
 x(BLOODYFIST_SWING2)
 x(FIST2_REST)
 x(FIST2_SWING_ALT)
-x(FIST3_REST)
-x(FIST3_SWING0)
-x(FIST3_SWING1)
-x(FIST3_SWING2)
-x(BLOODYFIST3_REST)
-x(BLOODYFIST3_SWING0)
-x(BLOODYFIST3_SWING1)
-x(BLOODYFIST3_SWING2)
-x(KICK0)
-x(KICK1)
-x(BLOODYKICK0)
-x(BLOODYKICK1)
 x(HEART_BLOOD0)
 x(HEART_BLOOD1)
 x(HEART_BLOOD2)

source/games/sw/src/weapon.cpp

@@ -45,6 +45,10 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 BEGIN_SW_NS
 
+#define GORE_ChunkS 2430
+#define PLASMA_Drip 1562 //2420
+#define GORE_Drip 1562 //2430
+
 struct MISSILE_PLACEMENT
 {
     int dist_over, dist_out;
@@ -151,12 +155,6 @@ short StatDamageList[STAT_DAMAGE_LIST_SIZE] =
 //
 //////////////////////
 
-// state for sprites that are not restored
-FState s_NotRestored[] =
-{
-    {SPR_NOTRESTORED, 'A', 100, nullptr,  &s_NotRestored[0]}
-};
-
 FState s_Suicide[] =
 {
     {SPR_SUICIDES, 'A', 100, &AF(DoSuicide), &s_Suicide[0]}
@@ -815,7 +813,6 @@ FState s_Plasma[] =
 };
 
 // follows actor spewing blood
-#define PLASMA_Drip 1562 //2420
 FState s_PlasmaFountain[] =
 {
     {SPR_PLASMA_Drip, 'A', PLASMA_RATE, &AF(DoPlasmaFountain), &s_PlasmaFountain[1]},
@@ -1546,7 +1543,6 @@ FState s_GoreSkullCap[] =
 };
 
 
-#define GORE_ChunkS 2430
 #define GORE_ChunkS_RATE 16
 
 FState s_GoreChunkS[] =
@@ -1557,7 +1553,6 @@ FState s_GoreChunkS[] =
     {SPR_GORE_ChunkS, 'D', GORE_ChunkS_RATE, &AF(DoShrapJumpFall), &s_GoreChunkS[0]},
 };
 
-#define GORE_Drip 1562 //2430
 #define GORE_Drip_RATE 16
 
 FState s_GoreDrip[] =
@@ -18089,7 +18084,6 @@ void QueueLoWangs(DSWActor* actor)
 
 static saveable_data saveable_weapon_data[] =
 {
-    SAVE_DATA(s_NotRestored),
     SAVE_DATA(s_Suicide),
     SAVE_DATA(s_DeadLoWang),
     SAVE_DATA(s_BreakLight),

wadsrc/static/filter/shadowwarrior/rmapinfo.texflags

@@ -16,8 +16,6 @@ textureflags
 		THINGRASS
 
 	TFLAG_PANELUSERPAL =
-		KICK0,
-		KICK1,
 		MINE_REST0,
 		MINE_REST1
 
@@ -26,17 +24,9 @@ textureflags
         FIST_SWING1,
         FIST_SWING2,
         FIST2_SWING0,
-        FIST2_SWING1,
-        FIST2_SWING2,
-        FIST3_SWING0,
-        FIST3_SWING1,
-        FIST3_SWING2,
         BLOODYFIST_SWING0,
         BLOODYFIST_SWING1,
-        BLOODYFIST_SWING2,
+        BLOODYFIST_SWING2
-        BLOODYFIST3_SWING0,
-        BLOODYFIST3_SWING1,
-        BLOODYFIST3_SWING2
 
 }
 
@@ -118,3 +108,11 @@ texturereplace shotgun2
 	SHOTGUN_RELOAD1 = SHOTGUN2_RELOAD1
 	SHOTGUN_RELOAD2	= SHOTGUN2_RELOAD2
 }
+
+texturereplace StarView
+{
+	"STAR@A1" = "STAR_DOWN@A1"
+	"STAR@B1" = "STAR_DOWN@B1"
+	"STAR@C1" = "STAR_DOWN@C1"
+	"STAR@D1" = "STAR_DOWN@D1"
+}

wadsrc/static/filter/shadowwarrior/texnames.txt

@@ -1,5 +1,5 @@
 4550 = "BUNNY_RUN", 5, 5, 1 // # of animation frames, # of rotations per frame (either 1, 5, 8), 1: order is frames first, rotation second. Generated name will be "BUNNY_RUN@A1" and up (A = frame, 1 = rotation) - The first frame will also get the base name.
-4575 = "BUNNY_SWIPE", 5, 5, 1
+4575 = "BUNNY_SWIPE", 5
 4580 = "BUNNY_DIE", 3
 4584 = "BUNNY_DEAD"
 
@@ -10,7 +10,7 @@
 
 4307 = "COOLG_DIE", 6
 4312 = "COOLG_DEAD"
-4268 = "COOLG_BIRTH", 8
+4268 = "COOLG_BIRTH", 9
 
 1420 = "COOLIE_CHARGE", 4, 5, 1
 1400 = "COOLIE_RUN", 4, 5, 1
@@ -39,8 +39,7 @@
 4236 = "GIRLNINJA_DEAD_SLICED"
 
 1469 = "GORO_RUN", 4, 5, 1
-1489 = "GORO_CHOP", 3, 5, 1
+1489 = "GORO_CHOP", 3, 3, 1, "GORO_RUN"
-1489 = "GORO_STAND", 1, 5, 3
 1513 = "GORO_SPELL", 2, 3, 1, "GORO_RUN"
 1504 = "GORO_DIE", 9
 1512 = "GORO_DEAD"
@@ -151,7 +150,7 @@
 4369 = RIPPER2_HANG, 1, 5, 1
 4394 = RIPPER2_SWIPE, 4, 5, 1
 4360 = RIPPER2_MEKONG, 3, 5, 1
-4422 = RIPPER2_HEART, 2, 5, 1
+4422 = RIPPER2_HEART, 2
 4414 = RIPPER2_DIE, 8
 4421 = RIPPER2_DEAD
 
@@ -198,7 +197,6 @@
 1270 = SUMO_DIE, 8
 1277 = SUMO_DEAD
 
-2323 = NOTRESTORED
 1 = SUICIDES
 1160 = DEADLOWANG
 
@@ -335,12 +333,12 @@
 2503 = WALLBLOOD4
 
 
-5426 = ZILLA_RUN, 4, 5, 1
+5426 = ZILLA_RUN, 4, 5, -1
-5524 = ZILLA_PAIN, 2, 5, 1
+5524 = ZILLA_PAIN, 1, 5, -1
-5446 = ZILLA_ROCKET, 4, 5, 1
+5446 = ZILLA_ROCKET, 4, 5, -1
-5466 = ZILLA_RAIL, 4, 5, 1
+5466 = ZILLA_RAIL, 4, 5, -1
-5506 = ZILLA_SHOOT, 4, 5, 1
+5506 = ZILLA_SHOOT, 4, 5, -1
-5486 = ZILLA_RECHARGE, 4, 5, 1
+5486 = ZILLA_RECHARGE, 4, 5, -1
 5510 = ZILLA_DIE, 9
 5518 = ZILLA_DEAD
 
@@ -367,22 +365,6 @@
 4050 = FIST2_REST                  
 4058 = FIST2_SWING_ALT             
 
-4060 = FIST3_REST                  
-4061 = FIST3_SWING0                
-4062 = FIST3_SWING1                
-4063 = FIST3_SWING2                
-
-4064 = BLOODYFIST3_REST            
-4065 = BLOODYFIST3_SWING0          
-4066 = BLOODYFIST3_SWING1          
-4067 = BLOODYFIST3_SWING2          
-
-4080 = KICK0                       
-4081 = KICK1                       
-
-4082 = BLOODYKICK0                 
-4083 = BLOODYKICK1                 
-
 2130 = STAR_REST                   
 2131 = STAR_DOWN0                  
 2132 = STAR_DOWN1                  
@@ -452,12 +434,11 @@
 
 2048 = HOTHEAD_REST                
 2049 = HOTHEAD_ATTACK              
-2327 = HOTHEAD_CENTER              
 2314 = HOTHEAD_TURN0               
-2315 = HOTHEAD_TURN1               
+2315 = HOTHEAD_TURN1
-2316 = HOTHEAD_TURN2               
+2316 = HOTHEAD_TURN2
-2317 = HOTHEAD_TURN3               
+2317 = HOTHEAD_TURN3
-2318 = HOTHEAD_CHOMP               
+2318 = HOTHEAD_CHOMP
 
 3157 = ON_FIRE0                    
 3158 = ON_FIRE1