Merge branch 'blankart-dev' into portv1objects

src/info/skincolors.h

@@ -1,5 +1,6 @@
 _(NONE)
-_(WHITE)
+
+_(WHITE) // kart colors
 _(SILVER)
 _(GREY)
 _(NICKEL)
@@ -12,8 +13,6 @@ _(PIGEON)
 _(SEPIA)
 _(BEIGE)
 _(WALNUT)
-_(CARAMEL)
-_(PEACH)
 _(BROWN)
 _(LEATHER)
 _(SALMON)
@@ -39,7 +38,8 @@ _(PUMPKIN)
 _(ROSEWOOD)
 _(BURGUNDY)
 _(TANGERINE)
-_(TAN)
+_(PEACH)
+_(CARAMEL)
 _(CREAM)
 _(GOLD)
 _(ROYAL)
@@ -48,10 +48,8 @@ _(COPPER)
 _(QUARRY)
 _(YELLOW)
 _(MUSTARD)
-_(BANANA)
-_(OLIVE)
 _(CROCODILE)
-_(PERIDOT)
+_(OLIVE)
 _(VOMIT)
 _(GARDEN)
 _(LIME)
@@ -64,19 +62,15 @@ _(ROBOHOOD)
 _(MINT)
 _(GREEN)
 _(PINETREE)
-_(TURTLE)
+_(EMERALD)
 _(SWAMP)
 _(DREAM)
 _(PLAGUE)
-_(EMERALD)
 _(ALGAE)
 _(CARIBBEAN)
 _(AZURE)
 _(AQUA)
-_(AQUAMARINE)
-_(TURQUOISE)
 _(TEAL)
-_(ROBIN)
 _(CYAN)
 _(JAWZ) // Oni's torment
 _(CERULEAN)
@@ -85,25 +79,20 @@ _(PLATINUM)
 _(SLATE)
 _(STEEL)
 _(THUNDER)
-_(NOVA)
 _(RUST)
 _(WRISTWATCH)
 _(JET)
 _(SAPPHIRE) // sweet mother, i cannot weave - slender aphrodite has overcome me with longing for a girl
-_(ULTRAMARINE)
 _(PERIWINKLE)
 _(BLUE)
-_(MIDNIGHT)
 _(BLUEBERRY)
-_(ULTRAVIOLET)
-_(BUBBLEGUM)
-_(THISTLE)
-_(PURPLE)
+_(NOVA)
 _(PASTEL)
 _(MOONSLAM)
+_(ULTRAVIOLET)
 _(DUSK)
-_(VIOLET)
-_(MAGENTA)
+_(BUBBLEGUM)
+_(PURPLE)
 _(FUCHSIA)
 _(TOXIC)
 _(MAUVE)
@@ -111,6 +100,19 @@ _(LAVENDER)
 _(BYZANTIUM)
 _(POMEGRANATE)
 _(LILAC)
+
+_(TAN) // v2 colors, i think? separated from the rest (yay compatmode!)
+_(BANANA)
+_(PERIDOT)
+_(TURTLE)
+_(AQUAMARINE)
+_(TURQUOISE)
+_(ROBIN)
+_(ULTRAMARINE)
+_(MIDNIGHT)
+_(THISTLE)
+_(VIOLET)
+_(MAGENTA)
 _(BLOSSOM)
 _(TAFFY)