From c8dcb57e8340c163752e8542a567ddee0a4002ed Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sat, 11 Aug 2018 12:06:17 -0400
Subject: [PATCH] Remove ORBIDYA CENTER states, we don't need 'em

---
 src/dehacked.c | 13 -------------
 src/info.c     | 17 ++---------------
 src/info.h     | 13 -------------
 3 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index fd289dc18..5c2953a55 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -6041,24 +6041,11 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
 	"S_ORBITEM6",
 	"S_ORBITEM7",
 	"S_ORBITEM8",
-	"S_ORBITEM1_CENTER",
-	"S_ORBITEM2_CENTER",
-	"S_ORBITEM3_CENTER",
-	"S_ORBITEM4_CENTER",
-	"S_ORBITEM5_CENTER",
-	"S_ORBITEM6_CENTER",
-	"S_ORBITEM7_CENTER",
-	"S_ORBITEM8_CENTER",
 	"S_ORBIDYA1",
 	"S_ORBIDYA2",
 	"S_ORBIDYA3",
 	"S_ORBIDYA4",
 	"S_ORBIDYA5",
-	"S_ORBIDYA1_CENTER",
-	"S_ORBIDYA2_CENTER",
-	"S_ORBIDYA3_CENTER",
-	"S_ORBIDYA4_CENTER",
-	"S_ORBIDYA5_CENTER",
 
 	// "Flicky" helper
 	"S_NIGHTOPIANHELPER1",
diff --git a/src/info.c b/src/info.c
index 38ba0bdf6..e6b4e8314 100644
--- a/src/info.c
+++ b/src/info.c
@@ -3338,24 +3338,11 @@ state_t states[NUMSTATES] =
 	{SPR_CEMG, FF_FULLBRIGHT|5, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM6}, // S_ORBITEM6
 	{SPR_CEMG, FF_FULLBRIGHT|6, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM7}, // S_ORBITEM7
 	{SPR_CEMG, FF_FULLBRIGHT|7, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM8
-	{SPR_CEMG, FF_FULLBRIGHT,   1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM1_CENTER}, // S_ORBITEM1_CENTER
-	{SPR_CEMG, FF_FULLBRIGHT|1, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM2_CENTER}, // S_ORBITEM2_CENTER
-	{SPR_CEMG, FF_FULLBRIGHT|2, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM3_CENTER}, // S_ORBITEM3_CENTER
-	{SPR_CEMG, FF_FULLBRIGHT|3, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM4_CENTER}, // S_ORBITEM4_CENTER
-	{SPR_CEMG, FF_FULLBRIGHT|4, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM5_CENTER}, // S_ORBITEM5_CENTER
-	{SPR_CEMG, FF_FULLBRIGHT|5, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM6_CENTER}, // S_ORBITEM6_CENTER
-	{SPR_CEMG, FF_FULLBRIGHT|6, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM7_CENTER}, // S_ORBITEM7_CENTER
-	{SPR_CEMG, FF_FULLBRIGHT|7, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBITEM8_CENTER}, // S_ORBITEM8_CENTER
 	{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT,   1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA1}, // S_ORBIDYA1
 	{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|1, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA2}, // S_ORBIDYA2
 	{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|2, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA3}, // S_ORBIDYA3
 	{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|3, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA4}, // S_ORBIDYA4
 	{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|4, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBIDYA5}, // S_ORBIDYA5
-	{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT,   1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBIDYA1_CENTER}, // S_ORBIDYA1_CENTER
-	{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|1, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBIDYA2_CENTER}, // S_ORBIDYA2_CENTER
-	{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|2, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBIDYA3_CENTER}, // S_ORBIDYA3_CENTER
-	{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|3, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBIDYA4_CENTER}, // S_ORBIDYA4_CENTER
-	{SPR_IDYA, FF_TRANS20|FF_FULLBRIGHT|4, 1, {A_OrbitNights}, ANG2*2, 0x3000000, S_ORBIDYA5_CENTER}, // S_ORBIDYA5_CENTER
 
 	// Flicky helper for NiGHTS
 	{SPR_FL01, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER2}, // S_NIGHTOPIANHELPER1
@@ -14631,7 +14618,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_ORBITEM1,     // meleestate
 		S_ORBIDYA1,     // missilestate
 		S_XPLD1,        // deathstate
-		S_ORBITEM1_CENTER,     // xdeathstate
+		S_NULL,         // xdeathstate
 		sfx_s3k8a,      // deathsound
 		8,              // speed
 		8*FRACUNIT,     // radius
@@ -14641,7 +14628,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		0,              // damage
 		sfx_None,       // activesound
 		MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIP|MF_SCENERY, // flags
-		S_ORBIDYA1_CENTER // raisestate
+		S_NULL          // raisestate
 	},
 
 	{           // MT_LOCKON
diff --git a/src/info.h b/src/info.h
index 11150a114..a386b199a 100644
--- a/src/info.h
+++ b/src/info.h
@@ -3394,24 +3394,11 @@ typedef enum state
 	S_ORBITEM6,
 	S_ORBITEM7,
 	S_ORBITEM8,
-	S_ORBITEM1_CENTER,
-	S_ORBITEM2_CENTER,
-	S_ORBITEM3_CENTER,
-	S_ORBITEM4_CENTER,
-	S_ORBITEM5_CENTER,
-	S_ORBITEM6_CENTER,
-	S_ORBITEM7_CENTER,
-	S_ORBITEM8_CENTER,
 	S_ORBIDYA1,
 	S_ORBIDYA2,
 	S_ORBIDYA3,
 	S_ORBIDYA4,
 	S_ORBIDYA5,
-	S_ORBIDYA1_CENTER,
-	S_ORBIDYA2_CENTER,
-	S_ORBIDYA3_CENTER,
-	S_ORBIDYA4_CENTER,
-	S_ORBIDYA5_CENTER,
 
 	// "Flicky" helper
 	S_NIGHTOPIANHELPER1,