diff --git a/Build/Scripting/Lua.cfg b/Build/Scripting/Lua.cfg
index 251876e..e26f9dd 100644
--- a/Build/Scripting/Lua.cfg
+++ b/Build/Scripting/Lua.cfg
@@ -1989,30 +1989,7 @@ constants
 	S_MSSHIELD_F12;
 
 	// Ring
-	S_RING1;
-	S_RING2;
-	S_RING3;
-	S_RING4;
-	S_RING5;
-	S_RING6;
-	S_RING7;
-	S_RING8;
-	S_RING9;
-	S_RING10;
-	S_RING11;
-	S_RING12;
-	S_RING13;
-	S_RING14;
-	S_RING15;
-	S_RING16;
-	S_RING17;
-	S_RING18;
-	S_RING19;
-	S_RING20;
-	S_RING21;
-	S_RING22;
-	S_RING23;
-	S_RING24;
+	S_RING;
 
 	// Blue Sphere for special stages
 	S_BLUEBALL;
@@ -2028,39 +2005,10 @@ constants
 	S_GRAVWELLRED3;
 
 	// Individual Team Rings
-	S_TEAMRING1;
-	S_TEAMRING2;
-	S_TEAMRING3;
-	S_TEAMRING4;
-	S_TEAMRING5;
-	S_TEAMRING6;
-	S_TEAMRING7;
-	S_TEAMRING8;
-	S_TEAMRING9;
-	S_TEAMRING10;
-	S_TEAMRING11;
-	S_TEAMRING12;
-	S_TEAMRING13;
-	S_TEAMRING14;
-	S_TEAMRING15;
-	S_TEAMRING16;
-	S_TEAMRING17;
-	S_TEAMRING18;
-	S_TEAMRING19;
-	S_TEAMRING20;
-	S_TEAMRING21;
-	S_TEAMRING22;
-	S_TEAMRING23;
-	S_TEAMRING24;
+	S_TEAMRING;
 
 	// Special Stage Token
-	S_EMMY1;
-	S_EMMY2;
-	S_EMMY3;
-	S_EMMY4;
-	S_EMMY5;
-	S_EMMY6;
-	S_EMMY7;
+	S_EMMY;
 
 	// Special Stage Token
 	S_TOKEN;
@@ -2214,40 +2162,9 @@ constants
 	S_SPIKED2;
 
 	// Starpost
-	S_STARPOST1;
-	S_STARPOST2;
-	S_STARPOST3;
-	S_STARPOST4;
-	S_STARPOST5;
-	S_STARPOST6;
-	S_STARPOST7;
-	S_STARPOST8;
-	S_STARPOST9;
-	S_STARPOST10;
-	S_STARPOST11;
-	S_STARPOST12;
-	S_STARPOST13;
-	S_STARPOST14;
-	S_STARPOST15;
-	S_STARPOST16;
-	S_STARPOST17;
-	S_STARPOST18;
-	S_STARPOST19;
-	S_STARPOST20;
-	S_STARPOST21;
-	S_STARPOST22;
-	S_STARPOST23;
-	S_STARPOST24;
-	S_STARPOST25;
-	S_STARPOST26;
-	S_STARPOST27;
-	S_STARPOST28;
-	S_STARPOST29;
-	S_STARPOST30;
-	S_STARPOST31;
-	S_STARPOST32;
-	S_STARPOST33;
-	S_STARPOST34;
+	S_STARPOST_IDLE;
+	S_STARPOST_FLASH;
+	S_STARPOST_SPIN;
 
 	// Big floating mine
 	S_BIGMINE1;
@@ -2855,38 +2772,7 @@ constants
 	S_PITY10;
 
 	// Invincibility Sparkles
-	S_IVSP1;
-	S_IVSP2;
-	S_IVSP3;
-	S_IVSP4;
-	S_IVSP5;
-	S_IVSP6;
-	S_IVSP7;
-	S_IVSP8;
-	S_IVSP9;
-	S_IVSP10;
-	S_IVSP11;
-	S_IVSP12;
-	S_IVSP13;
-	S_IVSP14;
-	S_IVSP15;
-	S_IVSP16;
-	S_IVSP17;
-	S_IVSP18;
-	S_IVSP19;
-	S_IVSP20;
-	S_IVSP21;
-	S_IVSP22;
-	S_IVSP23;
-	S_IVSP24;
-	S_IVSP25;
-	S_IVSP26;
-	S_IVSP27;
-	S_IVSP28;
-	S_IVSP29;
-	S_IVSP30;
-	S_IVSP31;
-	S_IVSP32;
+	S_IVSP;
 
 	// Super Sonic Spark
 	S_SSPK1;
@@ -3073,283 +2959,17 @@ constants
 	S_RRNG6;
 	S_RRNG7;
 
-	// Bounce Ring
-	S_BOUNCERING1;
-	S_BOUNCERING2;
-	S_BOUNCERING3;
-	S_BOUNCERING4;
-	S_BOUNCERING5;
-	S_BOUNCERING6;
-	S_BOUNCERING7;
-	S_BOUNCERING8;
-	S_BOUNCERING9;
-	S_BOUNCERING10;
-	S_BOUNCERING11;
-	S_BOUNCERING12;
-	S_BOUNCERING13;
-	S_BOUNCERING14;
-	S_BOUNCERING15;
-	S_BOUNCERING16;
-	S_BOUNCERING17;
-	S_BOUNCERING18;
-	S_BOUNCERING19;
-	S_BOUNCERING20;
-	S_BOUNCERING21;
-	S_BOUNCERING22;
-	S_BOUNCERING23;
-	S_BOUNCERING24;
-	S_BOUNCERING25;
-	S_BOUNCERING26;
-	S_BOUNCERING27;
-	S_BOUNCERING28;
-	S_BOUNCERING29;
-	S_BOUNCERING30;
-	S_BOUNCERING31;
-	S_BOUNCERING32;
-	S_BOUNCERING33;
-	S_BOUNCERING34;
-	S_BOUNCERING35;
-
-	// Rail Ring
-	S_RAILRING1;
-	S_RAILRING2;
-	S_RAILRING3;
-	S_RAILRING4;
-	S_RAILRING5;
-	S_RAILRING6;
-	S_RAILRING7;
-	S_RAILRING8;
-	S_RAILRING9;
-	S_RAILRING10;
-	S_RAILRING11;
-	S_RAILRING12;
-	S_RAILRING13;
-	S_RAILRING14;
-	S_RAILRING15;
-	S_RAILRING16;
-	S_RAILRING17;
-	S_RAILRING18;
-	S_RAILRING19;
-	S_RAILRING20;
-	S_RAILRING21;
-	S_RAILRING22;
-	S_RAILRING23;
-	S_RAILRING24;
-	S_RAILRING25;
-	S_RAILRING26;
-	S_RAILRING27;
-	S_RAILRING28;
-	S_RAILRING29;
-	S_RAILRING30;
-	S_RAILRING31;
-	S_RAILRING32;
-	S_RAILRING33;
-	S_RAILRING34;
-	S_RAILRING35;
-
-	// Infinity Ring
-	S_INFINITYRING1;
-	S_INFINITYRING2;
-	S_INFINITYRING3;
-	S_INFINITYRING4;
-	S_INFINITYRING5;
-	S_INFINITYRING6;
-	S_INFINITYRING7;
-	S_INFINITYRING8;
-	S_INFINITYRING9;
-	S_INFINITYRING10;
-	S_INFINITYRING11;
-	S_INFINITYRING12;
-	S_INFINITYRING13;
-	S_INFINITYRING14;
-	S_INFINITYRING15;
-	S_INFINITYRING16;
-	S_INFINITYRING17;
-	S_INFINITYRING18;
-	S_INFINITYRING19;
-	S_INFINITYRING20;
-	S_INFINITYRING21;
-	S_INFINITYRING22;
-	S_INFINITYRING23;
-	S_INFINITYRING24;
-	S_INFINITYRING25;
-	S_INFINITYRING26;
-	S_INFINITYRING27;
-	S_INFINITYRING28;
-	S_INFINITYRING29;
-	S_INFINITYRING30;
-	S_INFINITYRING31;
-	S_INFINITYRING32;
-	S_INFINITYRING33;
-	S_INFINITYRING34;
-	S_INFINITYRING35;
-
-	// Automatic Ring
-	S_AUTOMATICRING1;
-	S_AUTOMATICRING2;
-	S_AUTOMATICRING3;
-	S_AUTOMATICRING4;
-	S_AUTOMATICRING5;
-	S_AUTOMATICRING6;
-	S_AUTOMATICRING7;
-	S_AUTOMATICRING8;
-	S_AUTOMATICRING9;
-	S_AUTOMATICRING10;
-	S_AUTOMATICRING11;
-	S_AUTOMATICRING12;
-	S_AUTOMATICRING13;
-	S_AUTOMATICRING14;
-	S_AUTOMATICRING15;
-	S_AUTOMATICRING16;
-	S_AUTOMATICRING17;
-	S_AUTOMATICRING18;
-	S_AUTOMATICRING19;
-	S_AUTOMATICRING20;
-	S_AUTOMATICRING21;
-	S_AUTOMATICRING22;
-	S_AUTOMATICRING23;
-	S_AUTOMATICRING24;
-	S_AUTOMATICRING25;
-	S_AUTOMATICRING26;
-	S_AUTOMATICRING27;
-	S_AUTOMATICRING28;
-	S_AUTOMATICRING29;
-	S_AUTOMATICRING30;
-	S_AUTOMATICRING31;
-	S_AUTOMATICRING32;
-	S_AUTOMATICRING33;
-	S_AUTOMATICRING34;
-	S_AUTOMATICRING35;
-
-	// Explosion Ring
-	S_EXPLOSIONRING1;
-	S_EXPLOSIONRING2;
-	S_EXPLOSIONRING3;
-	S_EXPLOSIONRING4;
-	S_EXPLOSIONRING5;
-	S_EXPLOSIONRING6;
-	S_EXPLOSIONRING7;
-	S_EXPLOSIONRING8;
-	S_EXPLOSIONRING9;
-	S_EXPLOSIONRING10;
-	S_EXPLOSIONRING11;
-	S_EXPLOSIONRING12;
-	S_EXPLOSIONRING13;
-	S_EXPLOSIONRING14;
-	S_EXPLOSIONRING15;
-	S_EXPLOSIONRING16;
-	S_EXPLOSIONRING17;
-	S_EXPLOSIONRING18;
-	S_EXPLOSIONRING19;
-	S_EXPLOSIONRING20;
-	S_EXPLOSIONRING21;
-	S_EXPLOSIONRING22;
-	S_EXPLOSIONRING23;
-	S_EXPLOSIONRING24;
-	S_EXPLOSIONRING25;
-	S_EXPLOSIONRING26;
-	S_EXPLOSIONRING27;
-	S_EXPLOSIONRING28;
-	S_EXPLOSIONRING29;
-	S_EXPLOSIONRING30;
-	S_EXPLOSIONRING31;
-	S_EXPLOSIONRING32;
-	S_EXPLOSIONRING33;
-	S_EXPLOSIONRING34;
-	S_EXPLOSIONRING35;
-
-	// Scatter Ring
-	S_SCATTERRING1;
-	S_SCATTERRING2;
-	S_SCATTERRING3;
-	S_SCATTERRING4;
-	S_SCATTERRING5;
-	S_SCATTERRING6;
-	S_SCATTERRING7;
-	S_SCATTERRING8;
-	S_SCATTERRING9;
-	S_SCATTERRING10;
-	S_SCATTERRING11;
-	S_SCATTERRING12;
-	S_SCATTERRING13;
-	S_SCATTERRING14;
-	S_SCATTERRING15;
-	S_SCATTERRING16;
-	S_SCATTERRING17;
-	S_SCATTERRING18;
-	S_SCATTERRING19;
-	S_SCATTERRING20;
-	S_SCATTERRING21;
-	S_SCATTERRING22;
-	S_SCATTERRING23;
-	S_SCATTERRING24;
-	S_SCATTERRING25;
-	S_SCATTERRING26;
-	S_SCATTERRING27;
-	S_SCATTERRING28;
-	S_SCATTERRING29;
-	S_SCATTERRING30;
-	S_SCATTERRING31;
-	S_SCATTERRING32;
-	S_SCATTERRING33;
-	S_SCATTERRING34;
-	S_SCATTERRING35;
-
-	// Grenade Ring
-	S_GRENADERING1;
-	S_GRENADERING2;
-	S_GRENADERING3;
-	S_GRENADERING4;
-	S_GRENADERING5;
-	S_GRENADERING6;
-	S_GRENADERING7;
-	S_GRENADERING8;
-	S_GRENADERING9;
-	S_GRENADERING10;
-	S_GRENADERING11;
-	S_GRENADERING12;
-	S_GRENADERING13;
-	S_GRENADERING14;
-	S_GRENADERING15;
-	S_GRENADERING16;
-	S_GRENADERING17;
-	S_GRENADERING18;
-	S_GRENADERING19;
-	S_GRENADERING20;
-	S_GRENADERING21;
-	S_GRENADERING22;
-	S_GRENADERING23;
-	S_GRENADERING24;
-	S_GRENADERING25;
-	S_GRENADERING26;
-	S_GRENADERING27;
-	S_GRENADERING28;
-	S_GRENADERING29;
-	S_GRENADERING30;
-	S_GRENADERING31;
-	S_GRENADERING32;
-	S_GRENADERING33;
-	S_GRENADERING34;
-	S_GRENADERING35;
+	// Weapon Ring Ammo
+	S_BOUNCERINGAMMO;
+	S_RAILRINGAMMO;
+	S_INFINITYRINGAMMO;
+	S_AUTOMATICRINGAMMO;
+	S_EXPLOSIONRINGAMMO;
+	S_SCATTERRINGAMMO;
+	S_GRENADERINGAMMO;
 
 	// Weapon pickup
-	S_BOUNCEPICKUP1;
-	S_BOUNCEPICKUP2;
-	S_BOUNCEPICKUP3;
-	S_BOUNCEPICKUP4;
-	S_BOUNCEPICKUP5;
-	S_BOUNCEPICKUP6;
-	S_BOUNCEPICKUP7;
-	S_BOUNCEPICKUP8;
-	S_BOUNCEPICKUP9;
-	S_BOUNCEPICKUP10;
-	S_BOUNCEPICKUP11;
-	S_BOUNCEPICKUP12;
-	S_BOUNCEPICKUP13;
-	S_BOUNCEPICKUP14;
-	S_BOUNCEPICKUP15;
-	S_BOUNCEPICKUP16;
-
+	S_BOUNCEPICKUP;
 	S_BOUNCEPICKUPFADE1;
 	S_BOUNCEPICKUPFADE2;
 	S_BOUNCEPICKUPFADE3;
@@ -3359,23 +2979,7 @@ constants
 	S_BOUNCEPICKUPFADE7;
 	S_BOUNCEPICKUPFADE8;
 
-	S_RAILPICKUP1;
-	S_RAILPICKUP2;
-	S_RAILPICKUP3;
-	S_RAILPICKUP4;
-	S_RAILPICKUP5;
-	S_RAILPICKUP6;
-	S_RAILPICKUP7;
-	S_RAILPICKUP8;
-	S_RAILPICKUP9;
-	S_RAILPICKUP10;
-	S_RAILPICKUP11;
-	S_RAILPICKUP12;
-	S_RAILPICKUP13;
-	S_RAILPICKUP14;
-	S_RAILPICKUP15;
-	S_RAILPICKUP16;
-
+	S_RAILPICKUP;
 	S_RAILPICKUPFADE1;
 	S_RAILPICKUPFADE2;
 	S_RAILPICKUPFADE3;
@@ -3385,23 +2989,7 @@ constants
 	S_RAILPICKUPFADE7;
 	S_RAILPICKUPFADE8;
 
-	S_AUTOPICKUP1;
-	S_AUTOPICKUP2;
-	S_AUTOPICKUP3;
-	S_AUTOPICKUP4;
-	S_AUTOPICKUP5;
-	S_AUTOPICKUP6;
-	S_AUTOPICKUP7;
-	S_AUTOPICKUP8;
-	S_AUTOPICKUP9;
-	S_AUTOPICKUP10;
-	S_AUTOPICKUP11;
-	S_AUTOPICKUP12;
-	S_AUTOPICKUP13;
-	S_AUTOPICKUP14;
-	S_AUTOPICKUP15;
-	S_AUTOPICKUP16;
-
+	S_AUTOPICKUP;
 	S_AUTOPICKUPFADE1;
 	S_AUTOPICKUPFADE2;
 	S_AUTOPICKUPFADE3;
@@ -3411,23 +2999,7 @@ constants
 	S_AUTOPICKUPFADE7;
 	S_AUTOPICKUPFADE8;
 
-	S_EXPLODEPICKUP1;
-	S_EXPLODEPICKUP2;
-	S_EXPLODEPICKUP3;
-	S_EXPLODEPICKUP4;
-	S_EXPLODEPICKUP5;
-	S_EXPLODEPICKUP6;
-	S_EXPLODEPICKUP7;
-	S_EXPLODEPICKUP8;
-	S_EXPLODEPICKUP9;
-	S_EXPLODEPICKUP10;
-	S_EXPLODEPICKUP11;
-	S_EXPLODEPICKUP12;
-	S_EXPLODEPICKUP13;
-	S_EXPLODEPICKUP14;
-	S_EXPLODEPICKUP15;
-	S_EXPLODEPICKUP16;
-
+	S_EXPLODEPICKUP;
 	S_EXPLODEPICKUPFADE1;
 	S_EXPLODEPICKUPFADE2;
 	S_EXPLODEPICKUPFADE3;
@@ -3437,23 +3009,7 @@ constants
 	S_EXPLODEPICKUPFADE7;
 	S_EXPLODEPICKUPFADE8;
 
-	S_SCATTERPICKUP1;
-	S_SCATTERPICKUP2;
-	S_SCATTERPICKUP3;
-	S_SCATTERPICKUP4;
-	S_SCATTERPICKUP5;
-	S_SCATTERPICKUP6;
-	S_SCATTERPICKUP7;
-	S_SCATTERPICKUP8;
-	S_SCATTERPICKUP9;
-	S_SCATTERPICKUP10;
-	S_SCATTERPICKUP11;
-	S_SCATTERPICKUP12;
-	S_SCATTERPICKUP13;
-	S_SCATTERPICKUP14;
-	S_SCATTERPICKUP15;
-	S_SCATTERPICKUP16;
-
+	S_SCATTERPICKUP;
 	S_SCATTERPICKUPFADE1;
 	S_SCATTERPICKUPFADE2;
 	S_SCATTERPICKUPFADE3;
@@ -3463,23 +3019,7 @@ constants
 	S_SCATTERPICKUPFADE7;
 	S_SCATTERPICKUPFADE8;
 
-	S_GRENADEPICKUP1;
-	S_GRENADEPICKUP2;
-	S_GRENADEPICKUP3;
-	S_GRENADEPICKUP4;
-	S_GRENADEPICKUP5;
-	S_GRENADEPICKUP6;
-	S_GRENADEPICKUP7;
-	S_GRENADEPICKUP8;
-	S_GRENADEPICKUP9;
-	S_GRENADEPICKUP10;
-	S_GRENADEPICKUP11;
-	S_GRENADEPICKUP12;
-	S_GRENADEPICKUP13;
-	S_GRENADEPICKUP14;
-	S_GRENADEPICKUP15;
-	S_GRENADEPICKUP16;
-
+	S_GRENADEPICKUP;
 	S_GRENADEPICKUPFADE1;
 	S_GRENADEPICKUPFADE2;
 	S_GRENADEPICKUPFADE3;
@@ -3860,101 +3400,22 @@ constants
 
 	S_ROCKSPAWN;
 
-	S_ROCKCRUMBLEA1;
-	S_ROCKCRUMBLEA2;
-	S_ROCKCRUMBLEA3;
-	S_ROCKCRUMBLEA4;
-	S_ROCKCRUMBLEA5;
-
-	S_ROCKCRUMBLEB1;
-	S_ROCKCRUMBLEB2;
-	S_ROCKCRUMBLEB3;
-	S_ROCKCRUMBLEB4;
-	S_ROCKCRUMBLEB5;
-
-	S_ROCKCRUMBLEC1;
-	S_ROCKCRUMBLEC2;
-	S_ROCKCRUMBLEC3;
-	S_ROCKCRUMBLEC4;
-	S_ROCKCRUMBLEC5;
-
-	S_ROCKCRUMBLED1;
-	S_ROCKCRUMBLED2;
-	S_ROCKCRUMBLED3;
-	S_ROCKCRUMBLED4;
-	S_ROCKCRUMBLED5;
-
-	S_ROCKCRUMBLEE1;
-	S_ROCKCRUMBLEE2;
-	S_ROCKCRUMBLEE3;
-	S_ROCKCRUMBLEE4;
-	S_ROCKCRUMBLEE5;
-
-	S_ROCKCRUMBLEF1;
-	S_ROCKCRUMBLEF2;
-	S_ROCKCRUMBLEF3;
-	S_ROCKCRUMBLEF4;
-	S_ROCKCRUMBLEF5;
-
-	S_ROCKCRUMBLEG1;
-	S_ROCKCRUMBLEG2;
-	S_ROCKCRUMBLEG3;
-	S_ROCKCRUMBLEG4;
-	S_ROCKCRUMBLEG5;
-
-	S_ROCKCRUMBLEH1;
-	S_ROCKCRUMBLEH2;
-	S_ROCKCRUMBLEH3;
-	S_ROCKCRUMBLEH4;
-	S_ROCKCRUMBLEH5;
-
-	S_ROCKCRUMBLEI1;
-	S_ROCKCRUMBLEI2;
-	S_ROCKCRUMBLEI3;
-	S_ROCKCRUMBLEI4;
-	S_ROCKCRUMBLEI5;
-
-	S_ROCKCRUMBLEJ1;
-	S_ROCKCRUMBLEJ2;
-	S_ROCKCRUMBLEJ3;
-	S_ROCKCRUMBLEJ4;
-	S_ROCKCRUMBLEJ5;
-
-	S_ROCKCRUMBLEK1;
-	S_ROCKCRUMBLEK2;
-	S_ROCKCRUMBLEK3;
-	S_ROCKCRUMBLEK4;
-	S_ROCKCRUMBLEK5;
-
-	S_ROCKCRUMBLEL1;
-	S_ROCKCRUMBLEL2;
-	S_ROCKCRUMBLEL3;
-	S_ROCKCRUMBLEL4;
-	S_ROCKCRUMBLEL5;
-
-	S_ROCKCRUMBLEM1;
-	S_ROCKCRUMBLEM2;
-	S_ROCKCRUMBLEM3;
-	S_ROCKCRUMBLEM4;
-	S_ROCKCRUMBLEM5;
-
-	S_ROCKCRUMBLEN1;
-	S_ROCKCRUMBLEN2;
-	S_ROCKCRUMBLEN3;
-	S_ROCKCRUMBLEN4;
-	S_ROCKCRUMBLEN5;
-
-	S_ROCKCRUMBLEO1;
-	S_ROCKCRUMBLEO2;
-	S_ROCKCRUMBLEO3;
-	S_ROCKCRUMBLEO4;
-	S_ROCKCRUMBLEO5;
-
-	S_ROCKCRUMBLEP1;
-	S_ROCKCRUMBLEP2;
-	S_ROCKCRUMBLEP3;
-	S_ROCKCRUMBLEP4;
-	S_ROCKCRUMBLEP5;
+	S_ROCKCRUMBLEA;
+	S_ROCKCRUMBLEB;
+	S_ROCKCRUMBLEC;
+	S_ROCKCRUMBLED;
+	S_ROCKCRUMBLEE;
+	S_ROCKCRUMBLEF;
+	S_ROCKCRUMBLEG;
+	S_ROCKCRUMBLEH;
+	S_ROCKCRUMBLEI;
+	S_ROCKCRUMBLEJ;
+	S_ROCKCRUMBLEK;
+	S_ROCKCRUMBLEL;
+	S_ROCKCRUMBLEM;
+	S_ROCKCRUMBLEN;
+	S_ROCKCRUMBLEO;
+	S_ROCKCRUMBLEP;
 
 	S_SRB1_CRAWLA1;
 	S_SRB1_CRAWLA2;
diff --git a/Build/Scripting/SOC.cfg b/Build/Scripting/SOC.cfg
index 4d24008..9460689 100644
--- a/Build/Scripting/SOC.cfg
+++ b/Build/Scripting/SOC.cfg
@@ -1975,30 +1975,7 @@ constants
 	S_MSSHIELD_F12;
 
 	// Ring
-	S_RING1;
-	S_RING2;
-	S_RING3;
-	S_RING4;
-	S_RING5;
-	S_RING6;
-	S_RING7;
-	S_RING8;
-	S_RING9;
-	S_RING10;
-	S_RING11;
-	S_RING12;
-	S_RING13;
-	S_RING14;
-	S_RING15;
-	S_RING16;
-	S_RING17;
-	S_RING18;
-	S_RING19;
-	S_RING20;
-	S_RING21;
-	S_RING22;
-	S_RING23;
-	S_RING24;
+	S_RING;
 
 	// Blue Sphere for special stages
 	S_BLUEBALL;
@@ -2014,39 +1991,10 @@ constants
 	S_GRAVWELLRED3;
 
 	// Individual Team Rings
-	S_TEAMRING1;
-	S_TEAMRING2;
-	S_TEAMRING3;
-	S_TEAMRING4;
-	S_TEAMRING5;
-	S_TEAMRING6;
-	S_TEAMRING7;
-	S_TEAMRING8;
-	S_TEAMRING9;
-	S_TEAMRING10;
-	S_TEAMRING11;
-	S_TEAMRING12;
-	S_TEAMRING13;
-	S_TEAMRING14;
-	S_TEAMRING15;
-	S_TEAMRING16;
-	S_TEAMRING17;
-	S_TEAMRING18;
-	S_TEAMRING19;
-	S_TEAMRING20;
-	S_TEAMRING21;
-	S_TEAMRING22;
-	S_TEAMRING23;
-	S_TEAMRING24;
+	S_TEAMRING;
 
 	// Special Stage Token
-	S_EMMY1;
-	S_EMMY2;
-	S_EMMY3;
-	S_EMMY4;
-	S_EMMY5;
-	S_EMMY6;
-	S_EMMY7;
+	S_EMMY;
 
 	// Special Stage Token
 	S_TOKEN;
@@ -2200,40 +2148,9 @@ constants
 	S_SPIKED2;
 
 	// Starpost
-	S_STARPOST1;
-	S_STARPOST2;
-	S_STARPOST3;
-	S_STARPOST4;
-	S_STARPOST5;
-	S_STARPOST6;
-	S_STARPOST7;
-	S_STARPOST8;
-	S_STARPOST9;
-	S_STARPOST10;
-	S_STARPOST11;
-	S_STARPOST12;
-	S_STARPOST13;
-	S_STARPOST14;
-	S_STARPOST15;
-	S_STARPOST16;
-	S_STARPOST17;
-	S_STARPOST18;
-	S_STARPOST19;
-	S_STARPOST20;
-	S_STARPOST21;
-	S_STARPOST22;
-	S_STARPOST23;
-	S_STARPOST24;
-	S_STARPOST25;
-	S_STARPOST26;
-	S_STARPOST27;
-	S_STARPOST28;
-	S_STARPOST29;
-	S_STARPOST30;
-	S_STARPOST31;
-	S_STARPOST32;
-	S_STARPOST33;
-	S_STARPOST34;
+	S_STARPOST_IDLE;
+	S_STARPOST_FLASH;
+	S_STARPOST_SPIN;
 
 	// Big floating mine
 	S_BIGMINE1;
@@ -2841,38 +2758,7 @@ constants
 	S_PITY10;
 
 	// Invincibility Sparkles
-	S_IVSP1;
-	S_IVSP2;
-	S_IVSP3;
-	S_IVSP4;
-	S_IVSP5;
-	S_IVSP6;
-	S_IVSP7;
-	S_IVSP8;
-	S_IVSP9;
-	S_IVSP10;
-	S_IVSP11;
-	S_IVSP12;
-	S_IVSP13;
-	S_IVSP14;
-	S_IVSP15;
-	S_IVSP16;
-	S_IVSP17;
-	S_IVSP18;
-	S_IVSP19;
-	S_IVSP20;
-	S_IVSP21;
-	S_IVSP22;
-	S_IVSP23;
-	S_IVSP24;
-	S_IVSP25;
-	S_IVSP26;
-	S_IVSP27;
-	S_IVSP28;
-	S_IVSP29;
-	S_IVSP30;
-	S_IVSP31;
-	S_IVSP32;
+	S_IVSP;
 
 	// Super Sonic Spark
 	S_SSPK1;
@@ -3059,283 +2945,17 @@ constants
 	S_RRNG6;
 	S_RRNG7;
 
-	// Bounce Ring
-	S_BOUNCERING1;
-	S_BOUNCERING2;
-	S_BOUNCERING3;
-	S_BOUNCERING4;
-	S_BOUNCERING5;
-	S_BOUNCERING6;
-	S_BOUNCERING7;
-	S_BOUNCERING8;
-	S_BOUNCERING9;
-	S_BOUNCERING10;
-	S_BOUNCERING11;
-	S_BOUNCERING12;
-	S_BOUNCERING13;
-	S_BOUNCERING14;
-	S_BOUNCERING15;
-	S_BOUNCERING16;
-	S_BOUNCERING17;
-	S_BOUNCERING18;
-	S_BOUNCERING19;
-	S_BOUNCERING20;
-	S_BOUNCERING21;
-	S_BOUNCERING22;
-	S_BOUNCERING23;
-	S_BOUNCERING24;
-	S_BOUNCERING25;
-	S_BOUNCERING26;
-	S_BOUNCERING27;
-	S_BOUNCERING28;
-	S_BOUNCERING29;
-	S_BOUNCERING30;
-	S_BOUNCERING31;
-	S_BOUNCERING32;
-	S_BOUNCERING33;
-	S_BOUNCERING34;
-	S_BOUNCERING35;
-
-	// Rail Ring
-	S_RAILRING1;
-	S_RAILRING2;
-	S_RAILRING3;
-	S_RAILRING4;
-	S_RAILRING5;
-	S_RAILRING6;
-	S_RAILRING7;
-	S_RAILRING8;
-	S_RAILRING9;
-	S_RAILRING10;
-	S_RAILRING11;
-	S_RAILRING12;
-	S_RAILRING13;
-	S_RAILRING14;
-	S_RAILRING15;
-	S_RAILRING16;
-	S_RAILRING17;
-	S_RAILRING18;
-	S_RAILRING19;
-	S_RAILRING20;
-	S_RAILRING21;
-	S_RAILRING22;
-	S_RAILRING23;
-	S_RAILRING24;
-	S_RAILRING25;
-	S_RAILRING26;
-	S_RAILRING27;
-	S_RAILRING28;
-	S_RAILRING29;
-	S_RAILRING30;
-	S_RAILRING31;
-	S_RAILRING32;
-	S_RAILRING33;
-	S_RAILRING34;
-	S_RAILRING35;
-
-	// Infinity Ring
-	S_INFINITYRING1;
-	S_INFINITYRING2;
-	S_INFINITYRING3;
-	S_INFINITYRING4;
-	S_INFINITYRING5;
-	S_INFINITYRING6;
-	S_INFINITYRING7;
-	S_INFINITYRING8;
-	S_INFINITYRING9;
-	S_INFINITYRING10;
-	S_INFINITYRING11;
-	S_INFINITYRING12;
-	S_INFINITYRING13;
-	S_INFINITYRING14;
-	S_INFINITYRING15;
-	S_INFINITYRING16;
-	S_INFINITYRING17;
-	S_INFINITYRING18;
-	S_INFINITYRING19;
-	S_INFINITYRING20;
-	S_INFINITYRING21;
-	S_INFINITYRING22;
-	S_INFINITYRING23;
-	S_INFINITYRING24;
-	S_INFINITYRING25;
-	S_INFINITYRING26;
-	S_INFINITYRING27;
-	S_INFINITYRING28;
-	S_INFINITYRING29;
-	S_INFINITYRING30;
-	S_INFINITYRING31;
-	S_INFINITYRING32;
-	S_INFINITYRING33;
-	S_INFINITYRING34;
-	S_INFINITYRING35;
-
-	// Automatic Ring
-	S_AUTOMATICRING1;
-	S_AUTOMATICRING2;
-	S_AUTOMATICRING3;
-	S_AUTOMATICRING4;
-	S_AUTOMATICRING5;
-	S_AUTOMATICRING6;
-	S_AUTOMATICRING7;
-	S_AUTOMATICRING8;
-	S_AUTOMATICRING9;
-	S_AUTOMATICRING10;
-	S_AUTOMATICRING11;
-	S_AUTOMATICRING12;
-	S_AUTOMATICRING13;
-	S_AUTOMATICRING14;
-	S_AUTOMATICRING15;
-	S_AUTOMATICRING16;
-	S_AUTOMATICRING17;
-	S_AUTOMATICRING18;
-	S_AUTOMATICRING19;
-	S_AUTOMATICRING20;
-	S_AUTOMATICRING21;
-	S_AUTOMATICRING22;
-	S_AUTOMATICRING23;
-	S_AUTOMATICRING24;
-	S_AUTOMATICRING25;
-	S_AUTOMATICRING26;
-	S_AUTOMATICRING27;
-	S_AUTOMATICRING28;
-	S_AUTOMATICRING29;
-	S_AUTOMATICRING30;
-	S_AUTOMATICRING31;
-	S_AUTOMATICRING32;
-	S_AUTOMATICRING33;
-	S_AUTOMATICRING34;
-	S_AUTOMATICRING35;
-
-	// Explosion Ring
-	S_EXPLOSIONRING1;
-	S_EXPLOSIONRING2;
-	S_EXPLOSIONRING3;
-	S_EXPLOSIONRING4;
-	S_EXPLOSIONRING5;
-	S_EXPLOSIONRING6;
-	S_EXPLOSIONRING7;
-	S_EXPLOSIONRING8;
-	S_EXPLOSIONRING9;
-	S_EXPLOSIONRING10;
-	S_EXPLOSIONRING11;
-	S_EXPLOSIONRING12;
-	S_EXPLOSIONRING13;
-	S_EXPLOSIONRING14;
-	S_EXPLOSIONRING15;
-	S_EXPLOSIONRING16;
-	S_EXPLOSIONRING17;
-	S_EXPLOSIONRING18;
-	S_EXPLOSIONRING19;
-	S_EXPLOSIONRING20;
-	S_EXPLOSIONRING21;
-	S_EXPLOSIONRING22;
-	S_EXPLOSIONRING23;
-	S_EXPLOSIONRING24;
-	S_EXPLOSIONRING25;
-	S_EXPLOSIONRING26;
-	S_EXPLOSIONRING27;
-	S_EXPLOSIONRING28;
-	S_EXPLOSIONRING29;
-	S_EXPLOSIONRING30;
-	S_EXPLOSIONRING31;
-	S_EXPLOSIONRING32;
-	S_EXPLOSIONRING33;
-	S_EXPLOSIONRING34;
-	S_EXPLOSIONRING35;
-
-	// Scatter Ring
-	S_SCATTERRING1;
-	S_SCATTERRING2;
-	S_SCATTERRING3;
-	S_SCATTERRING4;
-	S_SCATTERRING5;
-	S_SCATTERRING6;
-	S_SCATTERRING7;
-	S_SCATTERRING8;
-	S_SCATTERRING9;
-	S_SCATTERRING10;
-	S_SCATTERRING11;
-	S_SCATTERRING12;
-	S_SCATTERRING13;
-	S_SCATTERRING14;
-	S_SCATTERRING15;
-	S_SCATTERRING16;
-	S_SCATTERRING17;
-	S_SCATTERRING18;
-	S_SCATTERRING19;
-	S_SCATTERRING20;
-	S_SCATTERRING21;
-	S_SCATTERRING22;
-	S_SCATTERRING23;
-	S_SCATTERRING24;
-	S_SCATTERRING25;
-	S_SCATTERRING26;
-	S_SCATTERRING27;
-	S_SCATTERRING28;
-	S_SCATTERRING29;
-	S_SCATTERRING30;
-	S_SCATTERRING31;
-	S_SCATTERRING32;
-	S_SCATTERRING33;
-	S_SCATTERRING34;
-	S_SCATTERRING35;
-
-	// Grenade Ring
-	S_GRENADERING1;
-	S_GRENADERING2;
-	S_GRENADERING3;
-	S_GRENADERING4;
-	S_GRENADERING5;
-	S_GRENADERING6;
-	S_GRENADERING7;
-	S_GRENADERING8;
-	S_GRENADERING9;
-	S_GRENADERING10;
-	S_GRENADERING11;
-	S_GRENADERING12;
-	S_GRENADERING13;
-	S_GRENADERING14;
-	S_GRENADERING15;
-	S_GRENADERING16;
-	S_GRENADERING17;
-	S_GRENADERING18;
-	S_GRENADERING19;
-	S_GRENADERING20;
-	S_GRENADERING21;
-	S_GRENADERING22;
-	S_GRENADERING23;
-	S_GRENADERING24;
-	S_GRENADERING25;
-	S_GRENADERING26;
-	S_GRENADERING27;
-	S_GRENADERING28;
-	S_GRENADERING29;
-	S_GRENADERING30;
-	S_GRENADERING31;
-	S_GRENADERING32;
-	S_GRENADERING33;
-	S_GRENADERING34;
-	S_GRENADERING35;
+	// Weapon Ring Ammo
+	S_BOUNCERINGAMMO;
+	S_RAILRINGAMMO;
+	S_INFINITYRINGAMMO;
+	S_AUTOMATICRINGAMMO;
+	S_EXPLOSIONRINGAMMO;
+	S_SCATTERRINGAMMO;
+	S_GRENADERINGAMMO;
 
 	// Weapon pickup
-	S_BOUNCEPICKUP1;
-	S_BOUNCEPICKUP2;
-	S_BOUNCEPICKUP3;
-	S_BOUNCEPICKUP4;
-	S_BOUNCEPICKUP5;
-	S_BOUNCEPICKUP6;
-	S_BOUNCEPICKUP7;
-	S_BOUNCEPICKUP8;
-	S_BOUNCEPICKUP9;
-	S_BOUNCEPICKUP10;
-	S_BOUNCEPICKUP11;
-	S_BOUNCEPICKUP12;
-	S_BOUNCEPICKUP13;
-	S_BOUNCEPICKUP14;
-	S_BOUNCEPICKUP15;
-	S_BOUNCEPICKUP16;
-
+	S_BOUNCEPICKUP;
 	S_BOUNCEPICKUPFADE1;
 	S_BOUNCEPICKUPFADE2;
 	S_BOUNCEPICKUPFADE3;
@@ -3345,23 +2965,7 @@ constants
 	S_BOUNCEPICKUPFADE7;
 	S_BOUNCEPICKUPFADE8;
 
-	S_RAILPICKUP1;
-	S_RAILPICKUP2;
-	S_RAILPICKUP3;
-	S_RAILPICKUP4;
-	S_RAILPICKUP5;
-	S_RAILPICKUP6;
-	S_RAILPICKUP7;
-	S_RAILPICKUP8;
-	S_RAILPICKUP9;
-	S_RAILPICKUP10;
-	S_RAILPICKUP11;
-	S_RAILPICKUP12;
-	S_RAILPICKUP13;
-	S_RAILPICKUP14;
-	S_RAILPICKUP15;
-	S_RAILPICKUP16;
-
+	S_RAILPICKUP;
 	S_RAILPICKUPFADE1;
 	S_RAILPICKUPFADE2;
 	S_RAILPICKUPFADE3;
@@ -3371,23 +2975,7 @@ constants
 	S_RAILPICKUPFADE7;
 	S_RAILPICKUPFADE8;
 
-	S_AUTOPICKUP1;
-	S_AUTOPICKUP2;
-	S_AUTOPICKUP3;
-	S_AUTOPICKUP4;
-	S_AUTOPICKUP5;
-	S_AUTOPICKUP6;
-	S_AUTOPICKUP7;
-	S_AUTOPICKUP8;
-	S_AUTOPICKUP9;
-	S_AUTOPICKUP10;
-	S_AUTOPICKUP11;
-	S_AUTOPICKUP12;
-	S_AUTOPICKUP13;
-	S_AUTOPICKUP14;
-	S_AUTOPICKUP15;
-	S_AUTOPICKUP16;
-
+	S_AUTOPICKUP;
 	S_AUTOPICKUPFADE1;
 	S_AUTOPICKUPFADE2;
 	S_AUTOPICKUPFADE3;
@@ -3397,23 +2985,7 @@ constants
 	S_AUTOPICKUPFADE7;
 	S_AUTOPICKUPFADE8;
 
-	S_EXPLODEPICKUP1;
-	S_EXPLODEPICKUP2;
-	S_EXPLODEPICKUP3;
-	S_EXPLODEPICKUP4;
-	S_EXPLODEPICKUP5;
-	S_EXPLODEPICKUP6;
-	S_EXPLODEPICKUP7;
-	S_EXPLODEPICKUP8;
-	S_EXPLODEPICKUP9;
-	S_EXPLODEPICKUP10;
-	S_EXPLODEPICKUP11;
-	S_EXPLODEPICKUP12;
-	S_EXPLODEPICKUP13;
-	S_EXPLODEPICKUP14;
-	S_EXPLODEPICKUP15;
-	S_EXPLODEPICKUP16;
-
+	S_EXPLODEPICKUP;
 	S_EXPLODEPICKUPFADE1;
 	S_EXPLODEPICKUPFADE2;
 	S_EXPLODEPICKUPFADE3;
@@ -3423,23 +2995,7 @@ constants
 	S_EXPLODEPICKUPFADE7;
 	S_EXPLODEPICKUPFADE8;
 
-	S_SCATTERPICKUP1;
-	S_SCATTERPICKUP2;
-	S_SCATTERPICKUP3;
-	S_SCATTERPICKUP4;
-	S_SCATTERPICKUP5;
-	S_SCATTERPICKUP6;
-	S_SCATTERPICKUP7;
-	S_SCATTERPICKUP8;
-	S_SCATTERPICKUP9;
-	S_SCATTERPICKUP10;
-	S_SCATTERPICKUP11;
-	S_SCATTERPICKUP12;
-	S_SCATTERPICKUP13;
-	S_SCATTERPICKUP14;
-	S_SCATTERPICKUP15;
-	S_SCATTERPICKUP16;
-
+	S_SCATTERPICKUP;
 	S_SCATTERPICKUPFADE1;
 	S_SCATTERPICKUPFADE2;
 	S_SCATTERPICKUPFADE3;
@@ -3449,23 +3005,7 @@ constants
 	S_SCATTERPICKUPFADE7;
 	S_SCATTERPICKUPFADE8;
 
-	S_GRENADEPICKUP1;
-	S_GRENADEPICKUP2;
-	S_GRENADEPICKUP3;
-	S_GRENADEPICKUP4;
-	S_GRENADEPICKUP5;
-	S_GRENADEPICKUP6;
-	S_GRENADEPICKUP7;
-	S_GRENADEPICKUP8;
-	S_GRENADEPICKUP9;
-	S_GRENADEPICKUP10;
-	S_GRENADEPICKUP11;
-	S_GRENADEPICKUP12;
-	S_GRENADEPICKUP13;
-	S_GRENADEPICKUP14;
-	S_GRENADEPICKUP15;
-	S_GRENADEPICKUP16;
-
+	S_GRENADEPICKUP;
 	S_GRENADEPICKUPFADE1;
 	S_GRENADEPICKUPFADE2;
 	S_GRENADEPICKUPFADE3;
@@ -3846,101 +3386,22 @@ constants
 
 	S_ROCKSPAWN;
 
-	S_ROCKCRUMBLEA1;
-	S_ROCKCRUMBLEA2;
-	S_ROCKCRUMBLEA3;
-	S_ROCKCRUMBLEA4;
-	S_ROCKCRUMBLEA5;
-
-	S_ROCKCRUMBLEB1;
-	S_ROCKCRUMBLEB2;
-	S_ROCKCRUMBLEB3;
-	S_ROCKCRUMBLEB4;
-	S_ROCKCRUMBLEB5;
-
-	S_ROCKCRUMBLEC1;
-	S_ROCKCRUMBLEC2;
-	S_ROCKCRUMBLEC3;
-	S_ROCKCRUMBLEC4;
-	S_ROCKCRUMBLEC5;
-
-	S_ROCKCRUMBLED1;
-	S_ROCKCRUMBLED2;
-	S_ROCKCRUMBLED3;
-	S_ROCKCRUMBLED4;
-	S_ROCKCRUMBLED5;
-
-	S_ROCKCRUMBLEE1;
-	S_ROCKCRUMBLEE2;
-	S_ROCKCRUMBLEE3;
-	S_ROCKCRUMBLEE4;
-	S_ROCKCRUMBLEE5;
-
-	S_ROCKCRUMBLEF1;
-	S_ROCKCRUMBLEF2;
-	S_ROCKCRUMBLEF3;
-	S_ROCKCRUMBLEF4;
-	S_ROCKCRUMBLEF5;
-
-	S_ROCKCRUMBLEG1;
-	S_ROCKCRUMBLEG2;
-	S_ROCKCRUMBLEG3;
-	S_ROCKCRUMBLEG4;
-	S_ROCKCRUMBLEG5;
-
-	S_ROCKCRUMBLEH1;
-	S_ROCKCRUMBLEH2;
-	S_ROCKCRUMBLEH3;
-	S_ROCKCRUMBLEH4;
-	S_ROCKCRUMBLEH5;
-
-	S_ROCKCRUMBLEI1;
-	S_ROCKCRUMBLEI2;
-	S_ROCKCRUMBLEI3;
-	S_ROCKCRUMBLEI4;
-	S_ROCKCRUMBLEI5;
-
-	S_ROCKCRUMBLEJ1;
-	S_ROCKCRUMBLEJ2;
-	S_ROCKCRUMBLEJ3;
-	S_ROCKCRUMBLEJ4;
-	S_ROCKCRUMBLEJ5;
-
-	S_ROCKCRUMBLEK1;
-	S_ROCKCRUMBLEK2;
-	S_ROCKCRUMBLEK3;
-	S_ROCKCRUMBLEK4;
-	S_ROCKCRUMBLEK5;
-
-	S_ROCKCRUMBLEL1;
-	S_ROCKCRUMBLEL2;
-	S_ROCKCRUMBLEL3;
-	S_ROCKCRUMBLEL4;
-	S_ROCKCRUMBLEL5;
-
-	S_ROCKCRUMBLEM1;
-	S_ROCKCRUMBLEM2;
-	S_ROCKCRUMBLEM3;
-	S_ROCKCRUMBLEM4;
-	S_ROCKCRUMBLEM5;
-
-	S_ROCKCRUMBLEN1;
-	S_ROCKCRUMBLEN2;
-	S_ROCKCRUMBLEN3;
-	S_ROCKCRUMBLEN4;
-	S_ROCKCRUMBLEN5;
-
-	S_ROCKCRUMBLEO1;
-	S_ROCKCRUMBLEO2;
-	S_ROCKCRUMBLEO3;
-	S_ROCKCRUMBLEO4;
-	S_ROCKCRUMBLEO5;
-
-	S_ROCKCRUMBLEP1;
-	S_ROCKCRUMBLEP2;
-	S_ROCKCRUMBLEP3;
-	S_ROCKCRUMBLEP4;
-	S_ROCKCRUMBLEP5;
+	S_ROCKCRUMBLEA;
+	S_ROCKCRUMBLEB;
+	S_ROCKCRUMBLEC;
+	S_ROCKCRUMBLED;
+	S_ROCKCRUMBLEE;
+	S_ROCKCRUMBLEF;
+	S_ROCKCRUMBLEG;
+	S_ROCKCRUMBLEH;
+	S_ROCKCRUMBLEI;
+	S_ROCKCRUMBLEJ;
+	S_ROCKCRUMBLEK;
+	S_ROCKCRUMBLEL;
+	S_ROCKCRUMBLEM;
+	S_ROCKCRUMBLEN;
+	S_ROCKCRUMBLEO;
+	S_ROCKCRUMBLEP;
 
 	S_SRB1_CRAWLA1;
 	S_SRB1_CRAWLA2;