Reorder colors, ensure colored names are set properly

src/dehacked.c

@@ -8140,6 +8140,8 @@ static const char *COLOR_ENUMS[] = {					// Rejigged for Kart.
 	"GREY",			// SKINCOLOR_GREY
 	"NICKEL",		// SKINCOLOR_NICKEL
 	"BLACK",		// SKINCOLOR_BLACK
+	"FAIRY",		// SKINCOLOR_FAIRY
+	"POPCORN",		// SKINCOLOR_POPCORN
 	"SEPIA",		// SKINCOLOR_SEPIA
 	"BEIGE",		// SKINCOLOR_BEIGE
 	"BROWN",		// SKINCOLOR_BROWN
@@ -8167,9 +8169,9 @@ static const char *COLOR_ENUMS[] = {					// Rejigged for Kart.
 	"TANGERINE",	// SKINCOLOR_TANGERINE
 	"PEACH",		// SKINCOLOR_PEACH
 	"CARAMEL",		// SKINCOLOR_CARAMEL
-	"POPCORN",		// SKINCOLOR_POPCORN
 	"CREAM",		// SKINCOLOR_CREAM
 	"GOLD",			// SKINCOLOR_GOLD
+	"ROYAL",		// SKINCOLOR_ROYAL
 	"BRONZE",		// SKINCOLOR_BRONZE
 	"COPPER",		// SKINCOLOR_COPPER
 	"YELLOW",		// SKINCOLOR_YELLOW
@@ -8181,18 +8183,18 @@ static const char *COLOR_ENUMS[] = {					// Rejigged for Kart.
 	"HANDHELD",		// SKINCOLOR_HANDHELD
 	"TEA",			// SKINCOLOR_TEA
 	"PISTACHIO",	// SKINCOLOR_PISTACHIO
+	"MOSS",			// SKINCOLOR_MOSS
 	"CAMOUFLAGE",	// SKINCOLOR_CAMOUFLAGE
 	"ROBOHOOD",		// SKINCOLOR_ROBOHOOD
-	"MOSS",			// SKINCOLOR_MOSS
 	"MINT",			// SKINCOLOR_MINT
 	"GREEN",		// SKINCOLOR_GREEN
 	"PINETREE",		// SKINCOLOR_PINETREE
 	"EMERALD",		// SKINCOLOR_EMERALD
 	"SWAMP",		// SKINCOLOR_SWAMP
 	"DREAM",		// SKINCOLOR_DREAM
+	"PLAGUE",		// SKINCOLOR_PLAGUE
 	"ALGAE",		// SKINCOLOR_ALGAE
 	"CARIBBEAN",	// SKINCOLOR_CARIBBEAN
-	"PLAGUE",		// SKINCOLOR_PLAGUE
 	"AQUA",			// SKINCOLOR_AQUA
 	"TEAL",			// SKINCOLOR_TEAL
 	"CYAN",			// SKINCOLOR_CYAN
@@ -8210,20 +8212,18 @@ static const char *COLOR_ENUMS[] = {					// Rejigged for Kart.
 	"BLUEBERRY",	// SKINCOLOR_BLUEBERRY
 	"NOVA",			// SKINCOLOR_NOVA
 	"PASTEL",		// SKINCOLOR_PASTEL
+	"MOONSLAM",		// SKINCOLOR_MOONSLAM
 	"ULTRAVIOLET",	// SKINCOLOR_ULTRAVIOLET
 	"DUSK",			// SKINCOLOR_DUSK
-	"MOONSLAM",		// SKINCOLOR_MOONSLAM
 	"BUBBLEGUM",	// SKINCOLOR_BUBBLEGUM
 	"PURPLE",		// SKINCOLOR_PURPLE
 	"FUCHSIA",		// SKINCOLOR_FUCHSIA
 	"TOXIC",		// SKINCOLOR_TOXIC
-	"MAUVE",		// SKINCOLOR_MAUVE
-	"ROYAL",		// SKINCOLOR_ROYAL
 	"LAVENDER",		// SKINCOLOR_LAVENDER
 	"BYZANTIUM",	// SKINCOLOR_BYZANTIUM
+	"MAUVE",		// SKINCOLOR_MAUVE
 	"POMEGRANATE",	// SKINCOLOR_POMEGRANATE
 	"LILAC",		// SKINCOLOR_LILAC
-	"FAIRY",		// SKINCOLOR_FAIRY
 
 	// Special super colors
 	// Super Sonic Yellow
@@ -8261,7 +8261,7 @@ static const char *COLOR_ENUMS[] = {					// Rejigged for Kart.
 	"ASUPER2",		// SKINCOLOR_ASUPER2,
 	"ASUPER3",		// SKINCOLOR_ASUPER3,
 	"ASUPER4",		// SKINCOLOR_ASUPER4,
-	"ASUPER5"		// SKINCOLOR_ASUPER5,
+	"ASUPER5",		// SKINCOLOR_ASUPER5,
 	// Hyper Sonic Green
 	"GSUPER1",		// SKINCOLOR_GSUPER1,
 	"GSUPER2",		// SKINCOLOR_GSUPER2,
@@ -8279,7 +8279,7 @@ static const char *COLOR_ENUMS[] = {					// Rejigged for Kart.
 	"CSUPER2",		// SKINCOLOR_CSUPER2,
 	"CSUPER3",		// SKINCOLOR_CSUPER3,
 	"CSUPER4",		// SKINCOLOR_CSUPER4,
-	"CSUPER5",		// SKINCOLOR_CSUPER5,
+	"CSUPER5"		// SKINCOLOR_CSUPER5,
 };
 
 static const char *const POWERS_LIST[] = {

src/doomdef.h

@@ -257,6 +257,7 @@ typedef enum
 	SKINCOLOR_NICKEL,
 	SKINCOLOR_BLACK,
 	SKINCOLOR_POPCORN,
+	SKINCOLOR_FAIRY,
 	SKINCOLOR_SEPIA,
 	SKINCOLOR_BEIGE,
 	SKINCOLOR_BROWN,
@@ -286,6 +287,7 @@ typedef enum
 	SKINCOLOR_CARAMEL,
 	SKINCOLOR_CREAM,
 	SKINCOLOR_GOLD,
+	SKINCOLOR_ROYAL,
 	SKINCOLOR_BRONZE,
 	SKINCOLOR_COPPER,
 	SKINCOLOR_YELLOW,
@@ -293,13 +295,13 @@ typedef enum
 	SKINCOLOR_OLIVE,
 	SKINCOLOR_VOMIT,
 	SKINCOLOR_GARDEN,
-	SKINCOLOR_CAMOUFLAGE,
 	SKINCOLOR_LIME,
 	SKINCOLOR_HANDHELD,
 	SKINCOLOR_TEA,
 	SKINCOLOR_PISTACHIO,
-	SKINCOLOR_ROBOHOOD,
 	SKINCOLOR_MOSS,
+	SKINCOLOR_CAMOUFLAGE,
+	SKINCOLOR_ROBOHOOD,
 	SKINCOLOR_MINT,
 	SKINCOLOR_GREEN,
 	SKINCOLOR_PINETREE,
@@ -307,8 +309,8 @@ typedef enum
 	SKINCOLOR_SWAMP,
 	SKINCOLOR_DREAM,
 	SKINCOLOR_PLAGUE,
-	SKINCOLOR_CARIBBEAN,
 	SKINCOLOR_ALGAE,
+	SKINCOLOR_CARIBBEAN,
 	SKINCOLOR_AQUA,
 	SKINCOLOR_TEAL,
 	SKINCOLOR_CYAN,
@@ -326,20 +328,18 @@ typedef enum
 	SKINCOLOR_BLUEBERRY,
 	SKINCOLOR_NOVA,
 	SKINCOLOR_PASTEL,
+	SKINCOLOR_MOONSLAM,
 	SKINCOLOR_ULTRAVIOLET,
 	SKINCOLOR_DUSK,
-	SKINCOLOR_MOONSLAM,
 	SKINCOLOR_BUBBLEGUM,
 	SKINCOLOR_PURPLE,
 	SKINCOLOR_FUCHSIA,
 	SKINCOLOR_TOXIC,
 	SKINCOLOR_MAUVE,
-	SKINCOLOR_ROYAL,
 	SKINCOLOR_LAVENDER,
 	SKINCOLOR_BYZANTIUM,
 	SKINCOLOR_POMEGRANATE,
 	SKINCOLOR_LILAC,
-	SKINCOLOR_FAIRY,
 
 	// "Careful! MAXSKINCOLORS cannot be greater than 0x40 -- Which it is now."
 	// (This comment is a dirty liar! This is only limited by the integer type, so 255 for UINT8.)

src/hu_stuff.c

@@ -783,39 +783,134 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 
 			cstart = "\x83";
 
-			if (color <= SKINCOLOR_SILVER || color == SKINCOLOR_SLATE)
+			switch (color)
-				cstart = "\x80"; // white
+			{
-			else if (color <= SKINCOLOR_BLACK || color == SKINCOLOR_JET)
+				case SKINCOLOR_WHITE:
+				case SKINCOLOR_SILVER:
+				case SKINCOLOR_SLATE:
+					cstart = "\x80"; // White
+					break;
+				case SKINCOLOR_GREY:
+				case SKINCOLOR_NICKEL:
+				case SKINCOLOR_BLACK:
+				case SKINCOLOR_JET:
 					cstart = "\x86"; // V_GRAYMAP
-			else if (color <= SKINCOLOR_LEATHER)
+					break;
+				case SKINCOLOR_SEPIA:
+				case SKINCOLOR_BEIGE:
+				case SKINCOLOR_BROWN:
+				case SKINCOLOR_LEATHER:
+				case SKINCOLOR_RUST:
 					cstart = "\x8e"; // V_BROWNMAP
-			else if (color <= SKINCOLOR_ROSE || color == SKINCOLOR_LILAC)
+					break;
+				case SKINCOLOR_FAIRY:
+				case SKINCOLOR_SALMON:
+				case SKINCOLOR_PINK:
+				case SKINCOLOR_ROSE:
+				case SKINCOLOR_BRICK:
+				case SKINCOLOR_BUBBLEGUM:
+				case SKINCOLOR_LILAC:
 					cstart = "\x8d"; // V_PINKMAP
-			else if (color <= SKINCOLOR_KETCHUP)
+					break;
+				case SKINCOLOR_RUBY:
+				case SKINCOLOR_RASPBERRY:
+				case SKINCOLOR_CHERRY:
+				case SKINCOLOR_RED:
+				case SKINCOLOR_CRIMSON:
+				case SKINCOLOR_MAROON:
+				case SKINCOLOR_FLAME:
+				case SKINCOLOR_SCARLET:
+				case SKINCOLOR_KETCHUP:
 					cstart = "\x85"; // V_REDMAP
-			else if (color <= SKINCOLOR_TANGERINE)
+					break;
+				case SKINCOLOR_DAWN:
+				case SKINCOLOR_SUNSET:
+				case SKINCOLOR_CREAMSICLE:
+				case SKINCOLOR_ORANGE:
+				case SKINCOLOR_PUMPKIN:
+				case SKINCOLOR_ROSEWOOD:
+				case SKINCOLOR_BURGUNDY:
+				case SKINCOLOR_TANGERINE:
 					cstart = "\x87"; // V_ORANGEMAP
-			else if (color <= SKINCOLOR_CREAM)
+					break;
+				case SKINCOLOR_PEACH:
+				case SKINCOLOR_CARAMEL:
+				case SKINCOLOR_CREAM:
 					cstart = "\x8f"; // V_PEACHMAP
-			else if (color <= SKINCOLOR_COPPER)
+					break;
+				case SKINCOLOR_GOLD:
+				case SKINCOLOR_ROYAL:
+				case SKINCOLOR_BRONZE:
+				case SKINCOLOR_COPPER:
 					cstart = "\x8A"; // V_GOLDMAP
-			else if (color <= SKINCOLOR_OLIVE)
+					break;
+				case SKINCOLOR_POPCORN:
+				case SKINCOLOR_YELLOW:
+				case SKINCOLOR_MUSTARD:
+				case SKINCOLOR_OLIVE:
 					cstart = "\x82"; // V_YELLOWMAP
-			else if (color <= SKINCOLOR_PISTACHIO)
+					break;
+				case SKINCOLOR_VOMIT:
+				case SKINCOLOR_GARDEN:
+				case SKINCOLOR_TEA:
+				case SKINCOLOR_PISTACHIO:
 					cstart = "\x8b"; // V_TEAMAP
-			else if (color <= SKINCOLOR_ALGAE || color == SKINCOLOR_LIME || color == SKINCOLOR_HANDHELD)
+					break;
+				case SKINCOLOR_LIME:
+				case SKINCOLOR_HANDHELD:
+				case SKINCOLOR_MOSS:
+				case SKINCOLOR_CAMOUFLAGE:
+				case SKINCOLOR_ROBOHOOD:
+				case SKINCOLOR_MINT:
+				case SKINCOLOR_GREEN:
+				case SKINCOLOR_PINETREE:
+				case SKINCOLOR_EMERALD:
+				case SKINCOLOR_SWAMP:
+				case SKINCOLOR_DREAM:
+				case SKINCOLOR_PLAGUE:
+				case SKINCOLOR_ALGAE:
 					cstart = "\x83"; // V_GREENMAP
-			else if (color <= SKINCOLOR_NAVY || color == SKINCOLOR_SAPPHIRE)
+					break;
+				case SKINCOLOR_CARIBBEAN:
+				case SKINCOLOR_AQUA:
+				case SKINCOLOR_TEAL:
+				case SKINCOLOR_CYAN:
+				case SKINCOLOR_JAWZ:
+				case SKINCOLOR_CERULEAN:
+				case SKINCOLOR_NAVY:
+				case SKINCOLOR_SAPPHIRE:
 					cstart = "\x88"; // V_SKYMAP
-			else if (color <= SKINCOLOR_STEEL)
+					break;
+				case SKINCOLOR_PLATINUM:
+				case SKINCOLOR_STEEL:
 					cstart = "\x8c"; // V_STEELMAP
-			else if (color <= SKINCOLOR_BLUEBERRY)
+					break;
+				case SKINCOLOR_PERIWINKLE:
+				case SKINCOLOR_BLUE:
+				case SKINCOLOR_BLUEBERRY:
+				case SKINCOLOR_NOVA:
 					cstart = "\x84"; // V_BLUEMAP
-			else if (color == SKINCOLOR_PURPLE)
+					break;
+				case SKINCOLOR_ULTRAVIOLET:
+				case SKINCOLOR_PURPLE:
+				case SKINCOLOR_FUCHSIA:
 					cstart = "\x81"; // V_PURPLEMAP
-			else //if (color <= SKINCOLOR_POMEGRANATE)
+					break;
+				case SKINCOLOR_PASTEL:
+				case SKINCOLOR_MOONSLAM:
+				case SKINCOLOR_DUSK:
+				case SKINCOLOR_TOXIC:
+				case SKINCOLOR_MAUVE:
+				case SKINCOLOR_LAVENDER:
+				case SKINCOLOR_BYZANTIUM:
+				case SKINCOLOR_POMEGRANATE:
 					cstart = "\x89"; // V_LAVENDERMAP
+					break;
+				default:
+					break;
 			}
+		}
+
 		prefix = cstart;
 
 		// Give admins and remote admins their symbols.

src/k_kart.c

@@ -49,6 +49,8 @@ const char *KartColor_Names[MAXSKINCOLORS] =
 	"Grey",           // SKINCOLOR_GREY
 	"Nickel",         // SKINCOLOR_NICKEL
 	"Black",          // SKINCOLOR_BLACK
+	"Fairy",          // SKINCOLOR_FAIRY
+	"Popcorn",        // SKINCOLOR_POPCORN
 	"Sepia",          // SKINCOLOR_SEPIA
 	"Beige",          // SKINCOLOR_BEIGE
 	"Brown",          // SKINCOLOR_BROWN
@@ -76,9 +78,9 @@ const char *KartColor_Names[MAXSKINCOLORS] =
 	"Tangerine",      // SKINCOLOR_TANGERINE
 	"Peach",          // SKINCOLOR_PEACH
 	"Caramel",        // SKINCOLOR_CARAMEL
-	"Popcorn",        // SKINCOLOR_POPCORN
 	"Cream",          // SKINCOLOR_CREAM
 	"Gold",           // SKINCOLOR_GOLD
+	"Royal",          // SKINCOLOR_ROYAL
 	"Bronze",         // SKINCOLOR_BRONZE
 	"Copper",         // SKINCOLOR_COPPER
 	"Yellow",         // SKINCOLOR_YELLOW
@@ -90,18 +92,18 @@ const char *KartColor_Names[MAXSKINCOLORS] =
 	"Handheld",       // SKINCOLOR_HANDHELD
 	"Tea",            // SKINCOLOR_TEA
 	"Pistachio",      // SKINCOLOR_PISTACHIO
+	"Moss",           // SKINCOLOR_MOSS
 	"Camouflage",     // SKINCOLOR_CAMOUFLAGE
 	"Robo-Hood",      // SKINCOLOR_ROBOHOOD
-	"Moss",           // SKINCOLOR_MOSS
 	"Mint",           // SKINCOLOR_MINT
 	"Green",          // SKINCOLOR_GREEN
 	"Pinetree",       // SKINCOLOR_PINETREE
 	"Emerald",        // SKINCOLOR_EMERALD
 	"Swamp",          // SKINCOLOR_SWAMP
 	"Dream",          // SKINCOLOR_DREAM
+	"Plague",         // SKINCOLOR_PLAGUE
 	"Algae",          // SKINCOLOR_ALGAE
 	"Caribbean",      // SKINCOLOR_CARIBBEAN
-	"Plague",         // SKINCOLOR_PLAGUE
 	"Aqua",           // SKINCOLOR_AQUA
 	"Teal",           // SKINCOLOR_TEAL
 	"Cyan",           // SKINCOLOR_CYAN
@@ -119,20 +121,18 @@ const char *KartColor_Names[MAXSKINCOLORS] =
 	"Blueberry",      // SKINCOLOR_BLUEBERRY
 	"Nova",           // SKINCOLOR_NOVA
 	"Pastel",         // SKINCOLOR_PASTEL
+	"Moonslam",       // SKINCOLOR_MOONSLAM
 	"Ultraviolet",    // SKINCOLOR_ULTRAVIOLET
 	"Dusk",           // SKINCOLOR_DUSK
-	"Moonslam",       // SKINCOLOR_MOONSLAM
 	"Bubblegum",      // SKINCOLOR_BUBBLEGUM
 	"Purple",         // SKINCOLOR_PURPLE
 	"Fuchsia",        // SKINCOLOR_FUCHSIA
 	"Toxic",          // SKINCOLOR_TOXIC
 	"Mauve",          // SKINCOLOR_MAUVE
-	"Royal",          // SKINCOLOR_ROYAL
 	"Lavender",       // SKINCOLOR_LAVENDER
 	"Byzantium",      // SKINCOLOR_BYZANTIUM
 	"Pomegranate",    // SKINCOLOR_POMEGRANATE
-	"Lilac",          // SKINCOLOR_LILAC
+	"Lilac"           // SKINCOLOR_LILAC
-	"Fairy"           // SKINCOLOR_FAIRY
 };
 
 // Color_Opposite replacement; frame setting has not been changed from 8 for most, should be done later
@@ -144,6 +144,8 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_GREY,8,         // SKINCOLOR_GREY
 	SKINCOLOR_SILVER,8,       // SKINCOLOR_NICKEL
 	SKINCOLOR_WHITE,8,        // SKINCOLOR_BLACK
+	SKINCOLOR_CAMOUFLAGE,8,   // SKINCOLOR_FAIRY
+	SKINCOLOR_BUBBLEGUM,8,    // SKINCOLOR_POPCORN
 	SKINCOLOR_LEATHER,6,      // SKINCOLOR_SEPIA
 	SKINCOLOR_BROWN,2,        // SKINCOLOR_BEIGE
 	SKINCOLOR_BEIGE,8,        // SKINCOLOR_BROWN
@@ -171,9 +173,9 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_LIME,8,         // SKINCOLOR_TANGERINE
 	SKINCOLOR_CYAN,8,         // SKINCOLOR_PEACH
 	SKINCOLOR_CERULEAN,8,     // SKINCOLOR_CARAMEL
-	SKINCOLOR_BUBBLEGUM,8,    // SKINCOLOR_POPCORN
 	SKINCOLOR_COPPER,10,      // SKINCOLOR_CREAM
 	SKINCOLOR_SLATE,8,        // SKINCOLOR_GOLD
+	SKINCOLOR_PLATINUM,6,     // SKINCOLOR_ROYAL
 	SKINCOLOR_STEEL,8,        // SKINCOLOR_BRONZE
 	SKINCOLOR_CREAM,6,        // SKINCOLOR_COPPER
 	SKINCOLOR_AQUA,8,         // SKINCOLOR_YELLOW
@@ -185,18 +187,18 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_CHERRY,8,       // SKINCOLOR_HANDHELD
 	SKINCOLOR_SALMON,8,       // SKINCOLOR_TEA
 	SKINCOLOR_PINK,6,         // SKINCOLOR_PISTACHIO
+	SKINCOLOR_ROSE,8,         // SKINCOLOR_MOSS
 	SKINCOLOR_FAIRY,10,       // SKINCOLOR_CAMOUFLAGE
 	SKINCOLOR_VOMIT,8,        // SKINCOLOR_ROBOHOOD
-	SKINCOLOR_ROSE,8,         // SKINCOLOR_MOSS
 	SKINCOLOR_RASPBERRY,8,    // SKINCOLOR_MINT
 	SKINCOLOR_RED,8,          // SKINCOLOR_GREEN
 	SKINCOLOR_CRIMSON,8,      // SKINCOLOR_PINETREE
 	SKINCOLOR_PURPLE,8,       // SKINCOLOR_EMERALD
 	SKINCOLOR_BYZANTIUM,8,    // SKINCOLOR_SWAMP
 	SKINCOLOR_POMEGRANATE,8,  // SKINCOLOR_DREAM
+	SKINCOLOR_NOVA,8,         // SKINCOLOR_PLAGUE
 	SKINCOLOR_SCARLET,10,     // SKINCOLOR_ALGAE
 	SKINCOLOR_FLAME,8,        // SKINCOLOR_CARIBBEAN
-	SKINCOLOR_NOVA,8,         // SKINCOLOR_PLAGUE
 	SKINCOLOR_YELLOW,8,       // SKINCOLOR_AQUA
 	SKINCOLOR_OLIVE,8,        // SKINCOLOR_TEAL
 	SKINCOLOR_PEACH,8,        // SKINCOLOR_CYAN
@@ -214,19 +216,17 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_PUMPKIN,8,      // SKINCOLOR_BLUEBERRY
 	SKINCOLOR_PLAGUE,10,      // SKINCOLOR_NOVA
 	SKINCOLOR_FUCHSIA,11,     // SKINCOLOR_PASTEL
+	SKINCOLOR_SUNSET,10,      // SKINCOLOR_MOONSLAM
 	SKINCOLOR_MAUVE,10,       // SKINCOLOR_ULTRAVIOLET
 	SKINCOLOR_DAWN,6,         // SKINCOLOR_DUSK
-	SKINCOLOR_SUNSET,10,      // SKINCOLOR_MOONSLAM
 	SKINCOLOR_EMERALD,8,      // SKINCOLOR_PURPLE
 	SKINCOLOR_PASTEL,11,      // SKINCOLOR_FUCHSIA
 	SKINCOLOR_MAROON,8,       // SKINCOLOR_TOXIC
 	SKINCOLOR_ULTRAVIOLET,8,  // SKINCOLOR_MAUVE
-	SKINCOLOR_PLATINUM,6,     // SKINCOLOR_ROYAL
 	SKINCOLOR_GARDEN,6,       // SKINCOLOR_LAVENDER
 	SKINCOLOR_SWAMP,8,        // SKINCOLOR_BYZANTIUM
 	SKINCOLOR_DREAM,8,        // SKINCOLOR_POMEGRANATE
-	SKINCOLOR_JAWZ,6,         // SKINCOLOR_LILAC
+	SKINCOLOR_JAWZ,6          // SKINCOLOR_LILAC
-	SKINCOLOR_CAMOUFLAGE,8    // SKINCOLOR_FAIRY
 };
 
 UINT8 colortranslations[MAXTRANSLATIONS][16] = {
@@ -236,6 +236,8 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{  1,   3,   5,   7,   9,  11,  13,  15,  17,  19,  21,  23,  25,  27,  29,  31}, // SKINCOLOR_GREY
 	{  3,   5,   8,  11,  15,  17,  19,  21,  23,  24,  25,  26,  27,  29,  30,  31}, // SKINCOLOR_NICKEL
 	{  4,   7,  11,  15,  20,  22,  24,  27,  28,  28,  28,  29,  29,  30,  30,  31}, // SKINCOLOR_BLACK
+	{120, 120, 121, 121, 122, 123,  10,  14,  16,  18,  20,  22,  24,  26,  28,  31}, // SKINCOLOR_FAIRY
+	{120,  96,  97,  98,  99,  71,  32,  11,  13,  16,  18,  21,  23,  26,  28,  31}, // SKINCOLOR_POPCORN
 	{  0,   1,   3,   5,   7,   9,  34,  36,  38,  40,  42,  44,  60,  61,  62,  63}, // SKINCOLOR_SEPIA
 	{120,  65,  67,  69,  32,  34,  36,  38,  40,  42,  44,  45,  46,  47,  62,  63}, // SKINCOLOR_BEIGE
 	{ 67,  70,  73,  76,  48,  49,  51,  53,  54,  56,  58,  59,  61,  63,  29,  30}, // SKINCOLOR_BROWN
@@ -263,9 +265,9 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{ 98,  98, 112, 112, 113, 113,  84,  85,  87,  89,  91,  93,  95, 153, 156, 159}, // SKINCOLOR_TANGERINE
 	{120,  80,  66,  70,  72,  76, 148, 149, 150, 151, 153, 154, 156,  61,  62,  63}, // SKINCOLOR_PEACH
 	{ 64,  66,  68,  70,  72,  74,  76,  78,  48,  50,  52,  54,  56,  58,  60,  62}, // SKINCOLOR_CARAMEL
-	{120,  96,  97,  98,  99,  71,  32,  11,  13,  16,  18,  21,  23,  26,  28,  31}, // SKINCOLOR_POPCORN
 	{120, 120,  96,  96,  97,  82,  84,  77,  50,  54,  57,  59,  61,  63,  29,  31}, // SKINCOLOR_CREAM
 	{112, 112, 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, 117, 118, 118, 119}, // SKINCOLOR_GOLD
+	{ 97, 112, 113, 113, 114,  78,  53, 252, 252, 253, 253, 254, 255,  29,  30,  31}, // SKINCOLOR_ROYAL
 	{112, 113, 114, 115, 116, 117, 118, 119, 156, 157, 158, 159, 141, 141, 142, 143}, // SKINCOLOR_BRONZE
 	{120,  99, 113, 114, 116, 117, 119,  61,  63,  28,  28,  29,  29,  30,  30,  31}, // SKINCOLOR_COPPER
 	{ 96,  97,  98, 100, 101, 102, 104, 113, 114, 115, 116, 117, 118, 119, 156, 159}, // SKINCOLOR_YELLOW
@@ -277,18 +279,18 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{ 98, 104, 105, 105, 106, 167, 168, 169, 170, 171, 172, 173, 174, 175,  30,  31}, // SKINCOLOR_HANDHELD
 	{120, 120, 176, 176, 176, 177, 177, 178, 178, 179, 179, 180, 180, 181, 182, 183}, // SKINCOLOR_TEA
 	{120, 120, 176, 176, 177, 177, 178, 179, 165, 166, 167, 168, 169, 170, 171, 172}, // SKINCOLOR_PISTACHIO
+	{178, 178, 178, 179, 179, 180, 181, 182, 183, 172, 172, 173, 173, 174, 174, 175}, // SKINCOLOR_MOSS
 	{ 64,  66,  69,  32,  34,  37,  40, 182, 171, 172, 172, 173, 173, 174, 174, 175}, // SKINCOLOR_CAMOUFLAGE
 	{120, 176, 160, 165, 167, 168, 169, 182, 182, 171,  60,  61,  63,  29,  30,  31}, // SKINCOLOR_ROBOHOOD
-	{178, 178, 178, 179, 179, 180, 181, 182, 183, 172, 172, 173, 173, 174, 174, 175}, // SKINCOLOR_MOSS
 	{120, 176, 176, 176, 177, 163, 164, 165, 167, 221, 221, 222, 223, 207, 207,  31}, // SKINCOLOR_MINT
 	{160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175}, // SKINCOLOR_GREEN
 	{161, 163, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,  30,  30,  31}, // SKINCOLOR_PINETREE
 	{160, 184, 184, 185, 185, 186, 186, 187, 187, 188, 188, 189, 189, 190, 191, 175}, // SKINCOLOR_EMERALD
 	{160, 184, 185, 186, 187, 188, 189, 190, 191, 191,  29,  29,  30,  30,  31,  31}, // SKINCOLOR_SWAMP
 	{120, 120,  80,  80,  81, 177, 162, 164, 228, 228, 204, 204, 205, 205, 206, 207}, // SKINCOLOR_DREAM
+	{176, 160, 184, 185, 186, 187, 188, 230, 230, 206, 206, 207,  28,  29,  30,  31}, // SKINCOLOR_PLAGUE
 	{208, 209, 210, 211, 213, 220, 216, 167, 168, 188, 188, 189, 190, 191,  30,  31}, // SKINCOLOR_ALGAE
 	{120, 176, 177, 160, 185, 220, 216, 217, 221, 230, 206, 206, 254, 255,  29,  31}, // SKINCOLOR_CARIBBEAN
-	{176, 160, 184, 185, 186, 187, 188, 230, 230, 206, 206, 207,  28,  29,  30,  31}, // SKINCOLOR_PLAGUE
 	{120, 208, 208, 210, 212, 214, 220, 220, 220, 221, 221, 222, 222, 223, 223, 191}, // SKINCOLOR_AQUA
 	{210, 213, 220, 220, 220, 216, 216, 221, 221, 221, 222, 222, 223, 223, 191,  31}, // SKINCOLOR_TEAL
 	{120, 120, 208, 208, 209, 210, 211, 212, 213, 215, 216, 217, 218, 219, 222, 223}, // SKINCOLOR_CYAN
@@ -306,21 +308,18 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{226, 228, 229, 230, 232, 233, 235, 237, 239, 240, 242, 244, 246,  31,  31,  31}, // SKINCOLOR_BLUEBERRY
 	{120, 112,  82,  83,  84, 124, 248, 228, 228, 204, 205, 206, 207,  29,  30,  31}, // SKINCOLOR_NOVA
 	{120, 208, 209, 210, 211, 226, 202, 249, 194, 195, 196, 197, 198, 199, 255,  30}, // SKINCOLOR_PASTEL
+	{120, 224, 201, 226, 202, 249, 250, 196, 197, 198, 199, 140, 141, 142, 143,  31}, // SKINCOLOR_MOONSLAM
 	{120,  64,  81, 122, 192, 249, 203, 221, 221, 219, 219, 223, 223, 191, 191,  31}, // SKINCOLOR_ULTRAVIOLET
 	{121, 145, 192, 249, 250, 251, 204, 204, 205, 205, 206, 206, 207,  29,  30,  31}, // SKINCOLOR_DUSK
-	{120, 224, 201, 226, 202, 249, 250, 196, 197, 198, 199, 140, 141, 142, 143,  31}, // SKINCOLOR_MOONSLAM
 	{120,  96,  64, 121,  67, 144, 123, 192, 193, 194, 195, 196, 197, 198, 199,  30}, // SKINCOLOR_BUBBLEGUM
 	{121, 145, 192, 192, 193, 194, 195, 196, 196, 197, 197, 198, 198, 199,  30,  31}, // SKINCOLOR_PURPLE
 	{120, 122, 124, 125, 126, 150, 196, 197, 198, 198, 199, 199, 240, 242, 244, 246}, // SKINCOLOR_FUCHSIA
 	{120, 120, 176, 176, 177,   6,   8,  10, 249, 250, 196, 197, 198, 199, 143,  31}, // SKINCOLOR_TOXIC
 	{ 96,  97,  98, 112, 113,  73, 146, 248, 249, 251, 205, 205, 206, 207,  29,  31}, // SKINCOLOR_MAUVE
-	{ 97, 112, 113, 113, 114,  78,  53, 252, 252, 253, 253, 254, 255,  29,  30,  31}, // SKINCOLOR_ROYAL
 	{121, 145, 192, 248, 249, 250, 251, 252, 252, 253, 253, 254, 254, 255,  30,  31}, // SKINCOLOR_LAVENDER
 	{144, 248, 249, 250, 251, 252, 253, 254, 255, 255,  29,  29,  30,  30,  31,  31}, // SKINCOLOR_BYZANTIUM
 	{144, 145, 146, 147, 148, 149, 150, 251, 251, 252, 252, 253, 254, 255,  29,  30}, // SKINCOLOR_POMEGRANATE
 	{120, 120, 120, 121, 121, 122, 122, 123, 192, 248, 249, 250, 251, 252, 253, 254}, // SKINCOLOR_LILAC
-	{120, 120, 121, 121, 122, 123,  10,  14,  16,  18,  20,  22,  24,  26,  28,  31}, // SKINCOLOR_FAIRY
-	// MAXSKINCOLORS
 	{120, 120, 120, 120, 120, 120, 120, 120, 120, 120,  96, 100, 104, 113, 116, 119}, // SKINCOLOR_SUPER1
 	{120, 120, 120, 120, 120, 120, 120, 120,  96,  98, 101, 104, 113, 115, 117, 119}, // SKINCOLOR_SUPER2
 	{120, 120, 120, 120, 120, 120,  96,  98, 100, 102, 104, 113, 114, 116, 117, 119}, // SKINCOLOR_SUPER3
@@ -366,7 +365,6 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{120, 120, 120, 120, 120, 120,  96,  97,  98,  99,  81,  81,  70,  73,  76,  79}, // SKINCOLOR_CSUPER3
 	{120, 120, 120, 120,  96,  96,  97,  98,  99,  81,  81,  70,  72,  74,  76,  79}, // SKINCOLOR_CSUPER4
 	{120, 120,  96,  96,  97,  98,  98,  99,  81,  81,  69,  71,  73,  75,  77,  79}, // SKINCOLOR_CSUPER5
-	// MAXTRANSLATIONS
 };
 
 // Define for getting accurate color brightness readings according to how the human eye sees them.