vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'remotes/upstream/next' into join-passwords

Browse source
This commit is contained in:
fickleheart 2019-03-10 15:54:06 -05:00
parent 82f3d2cdb8 3de6231f7a
commit a834ada9ce
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/dehacked.c
View file

@ -8147,8 +8147,8 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
"GREY", // SKINCOLOR_GREY "GREY", // SKINCOLOR_GREY
"NICKEL", // SKINCOLOR_NICKEL "NICKEL", // SKINCOLOR_NICKEL
"BLACK", // SKINCOLOR_BLACK "BLACK", // SKINCOLOR_BLACK
"FAIRY", // SKINCOLOR_FAIRY
"POPCORN", // SKINCOLOR_POPCORN "POPCORN", // SKINCOLOR_POPCORN
"FAIRY", // SKINCOLOR_FAIRY
"SEPIA", // SKINCOLOR_SEPIA "SEPIA", // SKINCOLOR_SEPIA
"BEIGE", // SKINCOLOR_BEIGE "BEIGE", // SKINCOLOR_BEIGE
"BROWN", // SKINCOLOR_BROWN "BROWN", // SKINCOLOR_BROWN
@ -8226,12 +8226,16 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
"PURPLE", // SKINCOLOR_PURPLE "PURPLE", // SKINCOLOR_PURPLE
"FUCHSIA", // SKINCOLOR_FUCHSIA "FUCHSIA", // SKINCOLOR_FUCHSIA
"TOXIC", // SKINCOLOR_TOXIC "TOXIC", // SKINCOLOR_TOXIC
"MAUVE", // SKINCOLOR_MAUVE
"LAVENDER", // SKINCOLOR_LAVENDER "LAVENDER", // SKINCOLOR_LAVENDER
"BYZANTIUM", // SKINCOLOR_BYZANTIUM "BYZANTIUM", // SKINCOLOR_BYZANTIUM
"MAUVE", // SKINCOLOR_MAUVE
"POMEGRANATE", // SKINCOLOR_POMEGRANATE "POMEGRANATE", // SKINCOLOR_POMEGRANATE
"LILAC", // SKINCOLOR_LILAC "LILAC", // SKINCOLOR_LILAC
// Special super colors // Special super colors
// Super Sonic Yellow // Super Sonic Yellow
"SUPER1", // SKINCOLOR_SUPER1 "SUPER1", // SKINCOLOR_SUPER1
@ -8239,48 +8243,56 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
"SUPER3", // SKINCOLOR_SUPER3, "SUPER3", // SKINCOLOR_SUPER3,
"SUPER4", // SKINCOLOR_SUPER4, "SUPER4", // SKINCOLOR_SUPER4,
"SUPER5", // SKINCOLOR_SUPER5, "SUPER5", // SKINCOLOR_SUPER5,
// Super Tails Orange // Super Tails Orange
"TSUPER1", // SKINCOLOR_TSUPER1, "TSUPER1", // SKINCOLOR_TSUPER1,
"TSUPER2", // SKINCOLOR_TSUPER2, "TSUPER2", // SKINCOLOR_TSUPER2,
"TSUPER3", // SKINCOLOR_TSUPER3, "TSUPER3", // SKINCOLOR_TSUPER3,
"TSUPER4", // SKINCOLOR_TSUPER4, "TSUPER4", // SKINCOLOR_TSUPER4,
"TSUPER5", // SKINCOLOR_TSUPER5, "TSUPER5", // SKINCOLOR_TSUPER5,
// Super Knuckles Red // Super Knuckles Red
"KSUPER1", // SKINCOLOR_KSUPER1, "KSUPER1", // SKINCOLOR_KSUPER1,
"KSUPER2", // SKINCOLOR_KSUPER2, "KSUPER2", // SKINCOLOR_KSUPER2,
"KSUPER3", // SKINCOLOR_KSUPER3, "KSUPER3", // SKINCOLOR_KSUPER3,
"KSUPER4", // SKINCOLOR_KSUPER4, "KSUPER4", // SKINCOLOR_KSUPER4,
"KSUPER5", // SKINCOLOR_KSUPER5, "KSUPER5", // SKINCOLOR_KSUPER5,
// Hyper Sonic Pink // Hyper Sonic Pink
"PSUPER1", // SKINCOLOR_PSUPER1, "PSUPER1", // SKINCOLOR_PSUPER1,
"PSUPER2", // SKINCOLOR_PSUPER2, "PSUPER2", // SKINCOLOR_PSUPER2,
"PSUPER3", // SKINCOLOR_PSUPER3, "PSUPER3", // SKINCOLOR_PSUPER3,
"PSUPER4", // SKINCOLOR_PSUPER4, "PSUPER4", // SKINCOLOR_PSUPER4,
"PSUPER5", // SKINCOLOR_PSUPER5, "PSUPER5", // SKINCOLOR_PSUPER5,
// Hyper Sonic Blue // Hyper Sonic Blue
"BSUPER1", // SKINCOLOR_BSUPER1, "BSUPER1", // SKINCOLOR_BSUPER1,
"BSUPER2", // SKINCOLOR_BSUPER2, "BSUPER2", // SKINCOLOR_BSUPER2,
"BSUPER3", // SKINCOLOR_BSUPER3, "BSUPER3", // SKINCOLOR_BSUPER3,
"BSUPER4", // SKINCOLOR_BSUPER4, "BSUPER4", // SKINCOLOR_BSUPER4,
"BSUPER5" // SKINCOLOR_BSUPER5, "BSUPER5", // SKINCOLOR_BSUPER5,
// Aqua Super // Aqua Super
"ASUPER1", // SKINCOLOR_ASUPER1, "ASUPER1", // SKINCOLOR_ASUPER1,
"ASUPER2", // SKINCOLOR_ASUPER2, "ASUPER2", // SKINCOLOR_ASUPER2,
"ASUPER3", // SKINCOLOR_ASUPER3, "ASUPER3", // SKINCOLOR_ASUPER3,
"ASUPER4", // SKINCOLOR_ASUPER4, "ASUPER4", // SKINCOLOR_ASUPER4,
"ASUPER5", // SKINCOLOR_ASUPER5, "ASUPER5", // SKINCOLOR_ASUPER5,
// Hyper Sonic Green // Hyper Sonic Green
"GSUPER1", // SKINCOLOR_GSUPER1, "GSUPER1", // SKINCOLOR_GSUPER1,
"GSUPER2", // SKINCOLOR_GSUPER2, "GSUPER2", // SKINCOLOR_GSUPER2,
"GSUPER3", // SKINCOLOR_GSUPER3, "GSUPER3", // SKINCOLOR_GSUPER3,
"GSUPER4", // SKINCOLOR_GSUPER4, "GSUPER4", // SKINCOLOR_GSUPER4,
"GSUPER5", // SKINCOLOR_GSUPER5, "GSUPER5", // SKINCOLOR_GSUPER5,
// Hyper Sonic White // Hyper Sonic White
"WSUPER1", // SKINCOLOR_WSUPER1, "WSUPER1", // SKINCOLOR_WSUPER1,
"WSUPER2", // SKINCOLOR_WSUPER2, "WSUPER2", // SKINCOLOR_WSUPER2,
"WSUPER3", // SKINCOLOR_WSUPER3, "WSUPER3", // SKINCOLOR_WSUPER3,
"WSUPER4", // SKINCOLOR_WSUPER4, "WSUPER4", // SKINCOLOR_WSUPER4,
"WSUPER5", // SKINCOLOR_WSUPER5, "WSUPER5", // SKINCOLOR_WSUPER5,
// Creamy Super (Shadow?) // Creamy Super (Shadow?)
"CSUPER1", // SKINCOLOR_CSUPER1, "CSUPER1", // SKINCOLOR_CSUPER1,
"CSUPER2", // SKINCOLOR_CSUPER2, "CSUPER2", // SKINCOLOR_CSUPER2,