Skip to content

Free games for graphing calculators: NumWorks, TI-Nspire CX, Casio fx-CG50 and soon TI-84 Plus CE. Balatro, Celeste, Hollow Knight, Minecraft and more.

Subway Surfers: Jake clearer from behind, camera closer, media again

Mason363d92b84c72cb0
diff --git a/docs/media/gallery/subway.gif b/docs/media/gallery/subway.gif
index 696aacfa..9a20d3f9 100644
Binary files a/docs/media/gallery/subway.gif and b/docs/media/gallery/subway.gif differ
diff --git a/docs/media/subway.gif b/docs/media/subway.gif
index 2b962a93..91643f23 100644
Binary files a/docs/media/subway.gif and b/docs/media/subway.gif differ
diff --git a/docs/media/thumb_subway.png b/docs/media/thumb_subway.png
index 19488b80..ec8e6e1b 100644
Binary files a/docs/media/thumb_subway.png and b/docs/media/thumb_subway.png differ
diff --git a/games/subway/docs/bridge.png b/games/subway/docs/bridge.png
index 326674bb..55bad0d6 100644
Binary files a/games/subway/docs/bridge.png and b/games/subway/docs/bridge.png differ
diff --git a/games/subway/docs/jetpack.png b/games/subway/docs/jetpack.png
index 1c815d78..7551d77d 100644
Binary files a/games/subway/docs/jetpack.png and b/games/subway/docs/jetpack.png differ
diff --git a/games/subway/docs/run.png b/games/subway/docs/run.png
index f7a28574..f157a653 100644
Binary files a/games/subway/docs/run.png and b/games/subway/docs/run.png differ
diff --git a/games/subway/docs/shop.png b/games/subway/docs/shop.png
index 73297fd3..bd55ed5e 100644
Binary files a/games/subway/docs/shop.png and b/games/subway/docs/shop.png differ
diff --git a/games/subway/docs/title.png b/games/subway/docs/title.png
index 80cfbf54..b7576900 100644
Binary files a/games/subway/docs/title.png and b/games/subway/docs/title.png differ
diff --git a/games/subway/docs/tunnel.png b/games/subway/docs/tunnel.png
index c2788db4..b80e4dad 100644
Binary files a/games/subway/docs/tunnel.png and b/games/subway/docs/tunnel.png differ
diff --git a/games/subway/src/actors.c b/games/subway/src/actors.c
index 4571cab6..0dff8954 100644
--- a/games/subway/src/actors.c
+++ b/games/subway/src/actors.c
@@ -90,7 +90,7 @@ static void draw_model(const Model *m, const float (*a)[3], const M34 *root, flo
/* (nothing to do far away or behind) */
V3 c = ap(&cm[0], (V3){m->joints[0][0] * 0.001f, m->joints[0][1] * 0.001f, m->joints[0][2] * 0.001f});
if (c.z < -2.5f || c.z > 140) return;
- float amb = 0.6f * light * 255, dif = 0.45f * light * 255;
+ float amb = 0.55f * light * 255, dif = 0.5f * light * 255;
RV rv[256];
for (int pi = 0; pi < m->nparts; pi++) {
const MPart *p = &m->parts[pi];
diff --git a/games/subway/src/app.c b/games/subway/src/app.c
index 6acee398..4eb88e94 100644
--- a/games/subway/src/app.c
+++ b/games/subway/src/app.c
@@ -24,8 +24,8 @@ static char note[40]; /* the shop's word on the last try */
static float note_t;
static float cam_x, cam_y; /* the run's camera, smoothed */
static bool drawn; /* a screen that does not move is drawn once, then again when something changes */
-#define CAM_Y 4.8f /* above the ground */
-#define CAM_BACK 5.8f /* behind the runner */
+#define CAM_Y 4.4f /* above the ground */
+#define CAM_BACK 5.2f /* behind the runner */
/* colours of the game's screens */
#define NAVY 0x0B2A55
diff --git a/games/subway/src/data.c b/games/subway/src/data.c
index dff2c0ba..ec2c7cb8 100644
--- a/games/subway/src/data.c
+++ b/games/subway/src/data.c
@@ -1081,49 +1081,49 @@ static const Tri jake_t[1160] = {
{108,121,109,255}, {108,120,121,255}, {109,122,110,255}, {109,121,122,255}, {110,123,111,255}, {110,122,123,255}, {111,124,112,1}, {111,123,124,1},
{112,125,113,1}, {112,124,125,1}, {113,126,114,1}, {113,125,126,1}, {114,127,115,1}, {114,126,127,1}, {115,128,116,1}, {115,127,128,1},
{116,129,117,1}, {116,128,129,1}, {117,130,118,255}, {117,129,130,255}, {118,131,119,255}, {118,130,131,255}, {119,120,108,255}, {119,131,120,255},
- {120,133,121,255}, {120,132,133,255}, {121,134,122,255}, {121,133,134,255}, {122,135,123,255}, {122,134,135,255}, {123,136,124,1}, {123,135,136,1},
- {124,137,125,1}, {124,136,137,1}, {125,138,126,1}, {125,137,138,1}, {126,139,127,1}, {126,138,139,1}, {127,140,128,1}, {127,139,140,1},
- {128,141,129,1}, {128,140,141,1}, {129,142,130,255}, {129,141,142,255}, {130,143,131,255}, {130,142,143,255}, {131,132,120,255}, {131,143,132,255},
- {132,145,133,255}, {132,144,145,255}, {133,146,134,255}, {133,145,146,255}, {134,147,135,255}, {134,146,147,255}, {135,148,136,1}, {135,147,148,255},
- {136,149,137,1}, {136,148,149,1}, {137,150,138,1}, {137,149,150,1}, {138,151,139,1}, {138,150,151,1}, {139,152,140,1}, {139,151,152,1},
- {140,153,141,1}, {140,152,153,1}, {141,154,142,255}, {141,153,154,255}, {142,155,143,255}, {142,154,155,255}, {143,144,132,255}, {143,155,144,255},
+ {120,133,121,255}, {120,132,133,255}, {121,134,122,255}, {121,133,134,255}, {122,135,123,255}, {122,134,135,255}, {123,136,124,1}, {123,135,136,2},
+ {124,137,125,1}, {124,136,137,2}, {125,138,126,1}, {125,137,138,2}, {126,139,127,1}, {126,138,139,2}, {127,140,128,1}, {127,139,140,2},
+ {128,141,129,1}, {128,140,141,2}, {129,142,130,255}, {129,141,142,255}, {130,143,131,255}, {130,142,143,255}, {131,132,120,255}, {131,143,132,255},
+ {132,145,133,255}, {132,144,145,255}, {133,146,134,255}, {133,145,146,255}, {134,147,135,255}, {134,146,147,255}, {135,148,136,2}, {135,147,148,255},
+ {136,149,137,2}, {136,148,149,2}, {137,150,138,2}, {137,149,150,2}, {138,151,139,2}, {138,150,151,2}, {139,152,140,2}, {139,151,152,2},
+ {140,153,141,2}, {140,152,153,2}, {141,154,142,255}, {141,153,154,255}, {142,155,143,255}, {142,154,155,255}, {143,144,132,255}, {143,155,144,255},
{0,1,156,255}, {1,2,156,255}, {2,3,156,255}, {3,4,156,255}, {4,5,156,1}, {5,6,156,1}, {6,7,156,1}, {7,8,156,1},
{8,9,156,255}, {9,10,156,255}, {10,11,156,255}, {11,0,156,255}, {144,157,145,255}, {145,157,146,255}, {146,157,147,255}, {147,157,148,255},
- {148,157,149,1}, {149,157,150,1}, {150,157,151,1}, {151,157,152,1}, {152,157,153,255}, {153,157,154,255}, {154,157,155,255}, {155,157,144,255},
+ {148,157,149,2}, {149,157,150,2}, {150,157,151,2}, {151,157,152,2}, {152,157,153,255}, {153,157,154,255}, {154,157,155,255}, {155,157,144,255},
{0,11,10,0}, {1,12,11,0}, {2,13,12,0}, {3,14,13,0}, {4,15,14,0}, {5,16,15,0}, {6,17,16,0}, {7,18,17,0},
{8,19,18,0}, {9,10,19,0}, {10,11,21,0}, {11,12,22,0}, {12,13,23,0}, {13,14,24,0}, {14,15,25,0}, {15,16,26,0},
{16,17,27,0}, {17,18,28,0}, {18,19,29,0}, {19,10,20,0}, {0,11,1,255}, {0,10,11,255}, {1,12,2,255}, {1,11,12,255},
- {2,13,3,2}, {2,12,13,255}, {3,14,4,2}, {3,13,14,2}, {4,15,5,2}, {4,14,15,2}, {5,16,6,2}, {5,15,16,2},
- {6,17,7,2}, {6,16,17,2}, {7,18,8,255}, {7,17,18,255}, {8,19,9,255}, {8,18,19,255}, {9,10,0,255}, {9,19,10,255},
- {10,21,11,255}, {10,20,21,255}, {11,22,12,255}, {11,21,22,255}, {12,23,13,2}, {12,22,23,255}, {13,24,14,2}, {13,23,24,2},
- {14,25,15,2}, {14,24,25,2}, {15,26,16,2}, {15,25,26,2}, {16,27,17,2}, {16,26,27,2}, {17,28,18,255}, {17,27,28,2},
+ {2,13,3,3}, {2,12,13,255}, {3,14,4,3}, {3,13,14,3}, {4,15,5,3}, {4,14,15,3}, {5,16,6,3}, {5,15,16,3},
+ {6,17,7,3}, {6,16,17,3}, {7,18,8,255}, {7,17,18,255}, {8,19,9,255}, {8,18,19,255}, {9,10,0,255}, {9,19,10,255},
+ {10,21,11,255}, {10,20,21,255}, {11,22,12,255}, {11,21,22,255}, {12,23,13,3}, {12,22,23,255}, {13,24,14,3}, {13,23,24,3},
+ {14,25,15,3}, {14,24,25,3}, {15,26,16,3}, {15,25,26,3}, {16,27,17,3}, {16,26,27,3}, {17,28,18,255}, {17,27,28,3},
{18,29,19,255}, {18,28,29,255}, {19,20,10,255}, {19,29,20,255}, {20,31,21,255}, {20,30,31,255}, {21,32,22,255}, {21,31,32,255},
- {22,33,23,2}, {22,32,33,255}, {23,34,24,2}, {23,33,34,2}, {24,35,25,2}, {24,34,35,2}, {25,36,26,2}, {25,35,36,2},
- {26,37,27,2}, {26,36,37,2}, {27,38,28,255}, {27,37,38,2}, {28,39,29,255}, {28,38,39,255}, {29,30,20,255}, {29,39,30,255},
- {30,41,31,255}, {30,40,41,255}, {31,42,32,255}, {31,41,42,255}, {32,43,33,2}, {32,42,43,255}, {33,44,34,2}, {33,43,44,2},
- {34,45,35,2}, {34,44,45,2}, {35,46,36,2}, {35,45,46,2}, {36,47,37,2}, {36,46,47,2}, {37,48,38,255}, {37,47,48,2},
+ {22,33,23,3}, {22,32,33,255}, {23,34,24,3}, {23,33,34,3}, {24,35,25,3}, {24,34,35,3}, {25,36,26,3}, {25,35,36,3},
+ {26,37,27,3}, {26,36,37,3}, {27,38,28,255}, {27,37,38,3}, {28,39,29,255}, {28,38,39,255}, {29,30,20,255}, {29,39,30,255},
+ {30,41,31,255}, {30,40,41,255}, {31,42,32,255}, {31,41,42,255}, {32,43,33,3}, {32,42,43,255}, {33,44,34,3}, {33,43,44,3},
+ {34,45,35,3}, {34,44,45,3}, {35,46,36,3}, {35,45,46,3}, {36,47,37,3}, {36,46,47,3}, {37,48,38,255}, {37,47,48,3},
{38,49,39,255}, {38,48,49,255}, {39,40,30,255}, {39,49,40,255}, {40,51,41,255}, {40,50,51,255}, {41,52,42,255}, {41,51,52,255},
- {42,53,43,2}, {42,52,53,255}, {43,54,44,2}, {43,53,54,2}, {44,55,45,2}, {44,54,55,2}, {45,56,46,2}, {45,55,56,2},
- {46,57,47,2}, {46,56,57,2}, {47,58,48,255}, {47,57,58,2}, {48,59,49,255}, {48,58,59,255}, {49,50,40,255}, {49,59,50,255},
- {50,61,51,255}, {50,60,61,255}, {51,62,52,255}, {51,61,62,255}, {52,63,53,2}, {52,62,63,255}, {53,64,54,2}, {53,63,64,2},
- {54,65,55,2}, {54,64,65,2}, {55,66,56,2}, {55,65,66,2}, {56,67,57,2}, {56,66,67,2}, {57,68,58,255}, {57,67,68,2},
+ {42,53,43,3}, {42,52,53,255}, {43,54,44,3}, {43,53,54,3}, {44,55,45,3}, {44,54,55,3}, {45,56,46,3}, {45,55,56,3},
+ {46,57,47,3}, {46,56,57,3}, {47,58,48,255}, {47,57,58,3}, {48,59,49,255}, {48,58,59,255}, {49,50,40,255}, {49,59,50,255},
+ {50,61,51,255}, {50,60,61,255}, {51,62,52,255}, {51,61,62,255}, {52,63,53,3}, {52,62,63,255}, {53,64,54,3}, {53,63,64,3},
+ {54,65,55,3}, {54,64,65,3}, {55,66,56,3}, {55,65,66,3}, {56,67,57,3}, {56,66,67,3}, {57,68,58,255}, {57,67,68,3},
{58,69,59,255}, {58,68,69,255}, {59,60,50,255}, {59,69,60,255}, {60,71,61,255}, {60,70,71,255}, {61,72,62,255}, {61,71,72,255},
- {62,73,63,255}, {62,72,73,255}, {63,74,64,2}, {63,73,74,2}, {64,75,65,2}, {64,74,75,2}, {65,76,66,2}, {65,75,76,2},
- {66,77,67,2}, {66,76,77,2}, {67,78,68,255}, {67,77,78,2}, {68,79,69,255}, {68,78,79,255}, {69,70,60,255}, {69,79,70,255},
- {0,1,80,255}, {1,2,80,255}, {2,3,80,255}, {3,4,80,2}, {4,5,80,2}, {5,6,80,2}, {6,7,80,2}, {7,8,80,255},
- {8,9,80,255}, {9,0,80,255}, {70,81,71,255}, {71,81,72,255}, {72,81,73,255}, {73,81,74,2}, {74,81,75,2}, {75,81,76,2},
- {76,81,77,2}, {77,81,78,255}, {78,81,79,255}, {79,81,70,255}, {0,1,6,255}, {0,6,5,255}, {1,2,7,255}, {1,7,6,255},
+ {62,73,63,255}, {62,72,73,255}, {63,74,64,3}, {63,73,74,3}, {64,75,65,3}, {64,74,75,3}, {65,76,66,3}, {65,75,76,3},
+ {66,77,67,3}, {66,76,77,3}, {67,78,68,255}, {67,77,78,3}, {68,79,69,255}, {68,78,79,255}, {69,70,60,255}, {69,79,70,255},
+ {0,1,80,255}, {1,2,80,255}, {2,3,80,255}, {3,4,80,3}, {4,5,80,3}, {5,6,80,3}, {6,7,80,3}, {7,8,80,255},
+ {8,9,80,255}, {9,0,80,255}, {70,81,71,255}, {71,81,72,255}, {72,81,73,255}, {73,81,74,3}, {74,81,75,3}, {75,81,76,3},
+ {76,81,77,3}, {77,81,78,255}, {78,81,79,255}, {79,81,70,255}, {0,1,6,255}, {0,6,5,255}, {1,2,7,255}, {1,7,6,255},
{2,3,8,255}, {2,8,7,255}, {3,4,9,255}, {3,9,8,255}, {5,6,11,255}, {5,11,10,255}, {6,7,12,255}, {6,12,11,255},
{7,8,13,255}, {7,13,12,255}, {8,9,14,255}, {8,14,13,255}, {0,11,1,255}, {0,10,11,255}, {1,12,2,255}, {1,11,12,255},
- {2,13,3,255}, {2,12,13,255}, {3,14,4,3}, {3,13,14,3}, {4,15,5,3}, {4,14,15,3}, {5,16,6,3}, {5,15,16,3},
- {6,17,7,3}, {6,16,17,3}, {7,18,8,255}, {7,17,18,255}, {8,19,9,255}, {8,18,19,255}, {9,10,0,255}, {9,19,10,255},
- {10,21,11,255}, {10,20,21,255}, {11,22,12,255}, {11,21,22,255}, {12,23,13,255}, {12,22,23,255}, {13,24,14,3}, {13,23,24,3},
- {14,25,15,3}, {14,24,25,3}, {15,26,16,3}, {15,25,26,3}, {16,27,17,3}, {16,26,27,3}, {17,28,18,255}, {17,27,28,255},
+ {2,13,3,255}, {2,12,13,255}, {3,14,4,4}, {3,13,14,4}, {4,15,5,4}, {4,14,15,4}, {5,16,6,4}, {5,15,16,4},
+ {6,17,7,4}, {6,16,17,4}, {7,18,8,255}, {7,17,18,255}, {8,19,9,255}, {8,18,19,255}, {9,10,0,255}, {9,19,10,255},
+ {10,21,11,255}, {10,20,21,255}, {11,22,12,255}, {11,21,22,255}, {12,23,13,255}, {12,22,23,255}, {13,24,14,4}, {13,23,24,4},
+ {14,25,15,4}, {14,24,25,4}, {15,26,16,4}, {15,25,26,4}, {16,27,17,4}, {16,26,27,4}, {17,28,18,255}, {17,27,28,255},
{18,29,19,255}, {18,28,29,255}, {19,20,10,255}, {19,29,20,255}, {20,31,21,255}, {20,30,31,255}, {21,32,22,255}, {21,31,32,255},
- {22,33,23,255}, {22,32,33,255}, {23,34,24,3}, {23,33,34,3}, {24,35,25,3}, {24,34,35,3}, {25,36,26,3}, {25,35,36,3},
- {26,37,27,3}, {26,36,37,3}, {27,38,28,255}, {27,37,38,255}, {28,39,29,255}, {28,38,39,255}, {29,30,20,255}, {29,39,30,255},
- {0,1,40,255}, {1,2,40,255}, {2,3,40,255}, {3,4,40,3}, {4,5,40,3}, {5,6,40,3}, {6,7,40,3}, {7,8,40,255},
- {8,9,40,255}, {9,0,40,255}, {30,41,31,255}, {31,41,32,255}, {32,41,33,255}, {33,41,34,3}, {34,41,35,3}, {35,41,36,3},
+ {22,33,23,255}, {22,32,33,255}, {23,34,24,4}, {23,33,34,4}, {24,35,25,4}, {24,34,35,4}, {25,36,26,4}, {25,35,36,4},
+ {26,37,27,4}, {26,36,37,4}, {27,38,28,255}, {27,37,38,255}, {28,39,29,255}, {28,38,39,255}, {29,30,20,255}, {29,39,30,255},
+ {0,1,40,255}, {1,2,40,255}, {2,3,40,255}, {3,4,40,4}, {4,5,40,4}, {5,6,40,4}, {6,7,40,4}, {7,8,40,255},
+ {8,9,40,255}, {9,0,40,255}, {30,41,31,255}, {31,41,32,255}, {32,41,33,255}, {33,41,34,4}, {34,41,35,4}, {35,41,36,4},
{36,41,37,255}, {37,41,38,255}, {38,41,39,255}, {39,41,30,255}, {0,9,1,255}, {0,8,9,255}, {1,10,2,255}, {1,9,10,255},
{2,11,3,255}, {2,10,11,255}, {3,12,4,255}, {3,11,12,255}, {4,13,5,255}, {4,12,13,255}, {5,14,6,255}, {5,13,14,255},
{6,15,7,255}, {6,14,15,255}, {7,8,0,255}, {7,15,8,255}, {8,17,9,255}, {8,16,17,255}, {9,18,10,255}, {9,17,18,255},
@@ -1134,17 +1134,17 @@ static const Tri jake_t[1160] = {
{26,35,27,255}, {26,34,35,255}, {27,36,28,255}, {27,35,36,255}, {28,37,29,255}, {28,36,37,255}, {29,38,30,255}, {29,37,38,255},
{30,39,31,255}, {30,38,39,255}, {31,32,24,255}, {31,39,32,255}, {32,41,33,255}, {32,40,41,255}, {33,42,34,255}, {33,41,42,255},
{34,43,35,255}, {34,42,43,255}, {35,44,36,255}, {35,43,44,255}, {36,45,37,255}, {36,44,45,255}, {37,46,38,255}, {37,45,46,255},
- {38,47,39,255}, {38,46,47,255}, {39,40,32,255}, {39,47,40,255}, {40,49,41,4}, {40,48,49,255}, {41,50,42,5}, {41,49,50,6},
- {42,51,43,7}, {42,50,51,8}, {43,52,44,7}, {43,51,52,7}, {44,53,45,7}, {44,52,53,7}, {45,54,46,9}, {45,53,54,7},
- {46,55,47,10}, {46,54,55,11}, {47,48,40,255}, {47,55,48,255}, {48,57,49,12}, {48,56,57,255}, {49,58,50,13}, {49,57,58,14},
- {50,59,51,7}, {50,58,59,15}, {51,60,52,7}, {51,59,60,7}, {52,61,53,7}, {52,60,61,7}, {53,62,54,16}, {53,61,62,7},
- {54,63,55,17}, {54,62,63,18}, {55,56,48,255}, {55,63,56,19}, {56,65,57,20}, {56,64,65,255}, {57,66,58,21}, {57,65,66,22},
- {58,67,59,7}, {58,66,67,23}, {59,68,60,7}, {59,67,68,7}, {60,69,61,7}, {60,68,69,7}, {61,70,62,24}, {61,69,70,7},
- {62,71,63,25}, {62,70,71,26}, {63,64,56,255}, {63,71,64,27}, {64,73,65,28}, {64,72,73,255}, {65,74,66,29}, {65,73,74,30},
- {66,75,67,31}, {66,74,75,32}, {67,76,68,7}, {67,75,76,7}, {68,77,69,7}, {68,76,77,7}, {69,78,70,33}, {69,77,78,7},
- {70,79,71,33}, {70,78,79,34}, {71,72,64,255}, {71,79,72,35}, {0,1,80,255}, {1,2,80,255}, {2,3,80,255}, {3,4,80,255},
- {4,5,80,255}, {5,6,80,255}, {6,7,80,255}, {7,0,80,255}, {72,81,73,255}, {73,81,74,36}, {74,81,75,36}, {75,81,76,7},
- {76,81,77,7}, {77,81,78,37}, {78,81,79,37}, {79,81,72,255}, {0,9,1,255}, {0,8,9,255}, {1,10,2,255}, {1,9,10,255},
+ {38,47,39,255}, {38,46,47,255}, {39,40,32,255}, {39,47,40,255}, {40,49,41,5}, {40,48,49,255}, {41,50,42,6}, {41,49,50,7},
+ {42,51,43,8}, {42,50,51,9}, {43,52,44,8}, {43,51,52,8}, {44,53,45,8}, {44,52,53,8}, {45,54,46,10}, {45,53,54,8},
+ {46,55,47,11}, {46,54,55,12}, {47,48,40,255}, {47,55,48,255}, {48,57,49,13}, {48,56,57,255}, {49,58,50,14}, {49,57,58,15},
+ {50,59,51,8}, {50,58,59,16}, {51,60,52,8}, {51,59,60,8}, {52,61,53,8}, {52,60,61,8}, {53,62,54,17}, {53,61,62,8},
+ {54,63,55,18}, {54,62,63,19}, {55,56,48,255}, {55,63,56,20}, {56,65,57,21}, {56,64,65,255}, {57,66,58,22}, {57,65,66,23},
+ {58,67,59,8}, {58,66,67,24}, {59,68,60,8}, {59,67,68,8}, {60,69,61,8}, {60,68,69,8}, {61,70,62,25}, {61,69,70,8},
+ {62,71,63,26}, {62,70,71,27}, {63,64,56,255}, {63,71,64,28}, {64,73,65,29}, {64,72,73,255}, {65,74,66,30}, {65,73,74,31},
+ {66,75,67,32}, {66,74,75,33}, {67,76,68,8}, {67,75,76,8}, {68,77,69,8}, {68,76,77,8}, {69,78,70,34}, {69,77,78,8},
+ {70,79,71,34}, {70,78,79,35}, {71,72,64,255}, {71,79,72,36}, {0,1,80,255}, {1,2,80,255}, {2,3,80,255}, {3,4,80,255},
+ {4,5,80,255}, {5,6,80,255}, {6,7,80,255}, {7,0,80,255}, {72,81,73,255}, {73,81,74,37}, {74,81,75,37}, {75,81,76,8},
+ {76,81,77,8}, {77,81,78,38}, {78,81,79,38}, {79,81,72,255}, {0,9,1,255}, {0,8,9,255}, {1,10,2,255}, {1,9,10,255},
{2,11,3,255}, {2,10,11,255}, {3,12,4,255}, {3,11,12,255}, {4,13,5,255}, {4,12,13,255}, {5,14,6,255}, {5,13,14,255},
{6,15,7,255}, {6,14,15,255}, {7,8,0,255}, {7,15,8,255}, {8,17,9,255}, {8,16,17,255}, {9,18,10,255}, {9,17,18,255},
{10,19,11,255}, {10,18,19,255}, {11,20,12,255}, {11,19,20,255}, {12,21,13,255}, {12,20,21,255}, {13,22,14,255}, {13,21,22,255},
@@ -1154,17 +1154,17 @@ static const Tri jake_t[1160] = {
{26,35,27,255}, {26,34,35,255}, {27,36,28,255}, {27,35,36,255}, {28,37,29,255}, {28,36,37,255}, {29,38,30,255}, {29,37,38,255},
{30,39,31,255}, {30,38,39,255}, {31,32,24,255}, {31,39,32,255}, {32,41,33,255}, {32,40,41,255}, {33,42,34,255}, {33,41,42,255},
{34,43,35,255}, {34,42,43,255}, {35,44,36,255}, {35,43,44,255}, {36,45,37,255}, {36,44,45,255}, {37,46,38,255}, {37,45,46,255},
- {38,47,39,255}, {38,46,47,255}, {39,40,32,255}, {39,47,40,255}, {40,49,41,38}, {40,48,49,255}, {41,50,42,39}, {41,49,50,40},
- {42,51,43,7}, {42,50,51,40}, {43,52,44,7}, {43,51,52,7}, {44,53,45,7}, {44,52,53,7}, {45,54,46,41}, {45,53,54,7},
- {46,55,47,42}, {46,54,55,43}, {47,48,40,255}, {47,55,48,255}, {48,57,49,44}, {48,56,57,255}, {49,58,50,45}, {49,57,58,46},
- {50,59,51,7}, {50,58,59,46}, {51,60,52,7}, {51,59,60,7}, {52,61,53,7}, {52,60,61,7}, {53,62,54,47}, {53,61,62,7},
- {54,63,55,48}, {54,62,63,49}, {55,56,48,255}, {55,63,56,50}, {56,65,57,51}, {56,64,65,255}, {57,66,58,52}, {57,65,66,53},
- {58,67,59,7}, {58,66,67,53}, {59,68,60,7}, {59,67,68,7}, {60,69,61,7}, {60,68,69,7}, {61,70,62,54}, {61,69,70,7},
- {62,71,63,55}, {62,70,71,56}, {63,64,56,255}, {63,71,64,57}, {64,73,65,58}, {64,72,73,255}, {65,74,66,59}, {65,73,74,60},
- {66,75,67,61}, {66,74,75,62}, {67,76,68,7}, {67,75,76,7}, {68,77,69,7}, {68,76,77,7}, {69,78,70,63}, {69,77,78,7},
- {70,79,71,64}, {70,78,79,65}, {71,72,64,255}, {71,79,72,66}, {0,1,80,255}, {1,2,80,255}, {2,3,80,255}, {3,4,80,255},
- {4,5,80,255}, {5,6,80,255}, {6,7,80,255}, {7,0,80,255}, {72,81,73,255}, {73,81,74,67}, {74,81,75,67}, {75,81,76,7},
- {76,81,77,7}, {77,81,78,68}, {78,81,79,68}, {79,81,72,255}, {0,1,8,255}, {0,8,7,255}, {1,2,9,255}, {1,9,8,255},
+ {38,47,39,255}, {38,46,47,255}, {39,40,32,255}, {39,47,40,255}, {40,49,41,39}, {40,48,49,255}, {41,50,42,40}, {41,49,50,41},
+ {42,51,43,8}, {42,50,51,41}, {43,52,44,8}, {43,51,52,8}, {44,53,45,8}, {44,52,53,8}, {45,54,46,42}, {45,53,54,8},
+ {46,55,47,43}, {46,54,55,44}, {47,48,40,255}, {47,55,48,255}, {48,57,49,45}, {48,56,57,255}, {49,58,50,46}, {49,57,58,47},
+ {50,59,51,8}, {50,58,59,47}, {51,60,52,8}, {51,59,60,8}, {52,61,53,8}, {52,60,61,8}, {53,62,54,48}, {53,61,62,8},
+ {54,63,55,49}, {54,62,63,50}, {55,56,48,255}, {55,63,56,51}, {56,65,57,52}, {56,64,65,255}, {57,66,58,53}, {57,65,66,54},
+ {58,67,59,8}, {58,66,67,54}, {59,68,60,8}, {59,67,68,8}, {60,69,61,8}, {60,68,69,8}, {61,70,62,55}, {61,69,70,8},
+ {62,71,63,56}, {62,70,71,57}, {63,64,56,255}, {63,71,64,58}, {64,73,65,59}, {64,72,73,255}, {65,74,66,60}, {65,73,74,61},
+ {66,75,67,62}, {66,74,75,63}, {67,76,68,8}, {67,75,76,8}, {68,77,69,8}, {68,76,77,8}, {69,78,70,64}, {69,77,78,8},
+ {70,79,71,65}, {70,78,79,66}, {71,72,64,255}, {71,79,72,67}, {0,1,80,255}, {1,2,80,255}, {2,3,80,255}, {3,4,80,255},
+ {4,5,80,255}, {5,6,80,255}, {6,7,80,255}, {7,0,80,255}, {72,81,73,255}, {73,81,74,68}, {74,81,75,68}, {75,81,76,8},
+ {76,81,77,8}, {77,81,78,69}, {78,81,79,69}, {79,81,72,255}, {0,1,8,255}, {0,8,7,255}, {1,2,9,255}, {1,9,8,255},
{2,3,10,255}, {2,10,9,255}, {3,4,11,255}, {3,11,10,255}, {4,5,12,255}, {4,12,11,255}, {5,6,13,255}, {5,13,12,255},
{6,0,7,255}, {6,7,13,255}, {7,8,15,255}, {7,15,14,255}, {8,9,16,255}, {8,16,15,255}, {9,10,17,255}, {9,17,16,255},
{10,11,18,255}, {10,18,17,255}, {11,12,19,255}, {11,19,18,255}, {12,13,20,255}, {12,20,19,255}, {13,7,14,255}, {13,14,20,255},
@@ -1198,13 +1198,13 @@ static const Tri jake_t[1160] = {
{6,0,63,255}, {56,64,57,255}, {57,64,58,255}, {58,64,59,255}, {59,64,60,255}, {60,64,61,255}, {61,64,62,255}, {62,64,56,255},
};
static const MPart jake_p[9] = {{0,158,0,312,1}, {158,30,312,20,-1}, {188,82,332,160,0}, {270,15,492,16,1}, {285,42,508,80,0}, {327,82,588,160,0}, {409,82,748,160,0}, {491,65,908,126,0}, {556,65,1034,126,0},};
-static const uint16_t jake_pal[69] = {
- 10240,57050,29944,8713,63223,63223,63028,61275,63060,63223,63223,59649,
- 14496,23142,27970,25826,10240,10240,40806,40806,34436,23778,12993,12928,
- 38630,38630,19426,19426,61242,59065,59063,61145,59030,63290,56982,56950,
- 52725,50676,63223,63223,59681,63222,63191,60980,10272,12320,40807,25191,
- 23079,25890,40806,38630,38629,19394,25891,30213,12993,19361,59161,61209,
- 59031,63290,59063,61177,61209,59063,59030,52658,52659,
+static const uint16_t jake_pal[70] = {
+ 10240,61209,52757,29944,8713,63223,63223,63028,61275,63060,63223,63223,
+ 59649,14496,23142,27970,25826,10240,10240,40806,40806,34436,23778,12993,
+ 12928,38630,38630,19426,19426,61242,59065,59063,61145,59030,63290,56982,
+ 56950,52725,50676,63223,63223,59681,63222,63191,60980,10272,12320,40807,
+ 25191,23079,25890,40806,38630,38629,19394,25891,30213,12993,19361,59161,
+ 61209,59031,63290,59063,61177,61209,59063,59030,52658,52659,
};
static const int16_t jake_j[11][3] = {{0,761,0}, {0,794,0}, {0,1188,0}, {-157,1132,0}, {-415,1132,0}, {157,1132,0}, {415,1132,0}, {-132,741,0}, {-132,450,0}, {125,741,0}, {125,450,0}};
static const int8_t jake_parent[11] = {-1,0,1,1,3,1,5,0,7,0,9};
@@ -1316,53 +1316,53 @@ static const Tri jake_lo_t[624] = {
{52,62,53,255}, {52,61,62,255}, {53,54,45,255}, {53,62,54,255}, {54,64,55,255}, {54,63,64,255}, {55,65,56,255}, {55,64,65,255},
{56,66,57,1}, {56,65,66,255}, {57,67,58,1}, {57,66,67,1}, {58,68,59,1}, {58,67,68,1}, {59,69,60,1}, {59,68,69,1},
{60,70,61,255}, {60,69,70,1}, {61,71,62,255}, {61,70,71,255}, {62,63,54,255}, {62,71,63,255}, {63,73,64,255}, {63,72,73,255},
- {64,74,65,255}, {64,73,74,255}, {65,75,66,1}, {65,74,75,255}, {66,76,67,1}, {66,75,76,1}, {67,77,68,1}, {67,76,77,1},
- {68,78,69,1}, {68,77,78,1}, {69,79,70,255}, {69,78,79,1}, {70,80,71,255}, {70,79,80,255}, {71,72,63,255}, {71,80,72,255},
+ {64,74,65,255}, {64,73,74,255}, {65,75,66,2}, {65,74,75,255}, {66,76,67,2}, {66,75,76,2}, {67,77,68,2}, {67,76,77,2},
+ {68,78,69,2}, {68,77,78,2}, {69,79,70,255}, {69,78,79,2}, {70,80,71,255}, {70,79,80,255}, {71,72,63,255}, {71,80,72,255},
{0,1,81,255}, {1,2,81,255}, {2,3,81,255}, {3,4,81,1}, {4,5,81,1}, {5,6,81,1}, {6,7,81,255}, {7,8,81,255},
- {8,0,81,255}, {72,82,73,255}, {73,82,74,255}, {74,82,75,255}, {75,82,76,1}, {76,82,77,1}, {77,82,78,1}, {78,82,79,255},
+ {8,0,81,255}, {72,82,73,255}, {73,82,74,255}, {74,82,75,255}, {75,82,76,2}, {76,82,77,2}, {77,82,78,2}, {78,82,79,255},
{79,82,80,255}, {80,82,72,255}, {0,8,7,0}, {1,9,8,0}, {2,10,9,0}, {3,11,10,0}, {4,12,11,0}, {5,13,12,0},
{6,7,13,0}, {7,8,15,0}, {8,9,16,0}, {9,10,17,0}, {10,11,18,0}, {11,12,19,0}, {12,13,20,0}, {13,7,14,0},
- {0,9,1,255}, {0,8,9,255}, {1,10,2,255}, {1,9,10,255}, {2,11,3,2}, {2,10,11,2}, {3,12,4,2}, {3,11,12,2},
- {4,13,5,2}, {4,12,13,2}, {5,14,6,2}, {5,13,14,2}, {6,15,7,255}, {6,14,15,255}, {7,8,0,255}, {7,15,8,255},
- {8,17,9,255}, {8,16,17,255}, {9,18,10,255}, {9,17,18,255}, {10,19,11,2}, {10,18,19,2}, {11,20,12,2}, {11,19,20,2},
- {12,21,13,2}, {12,20,21,2}, {13,22,14,2}, {13,21,22,2}, {14,23,15,255}, {14,22,23,255}, {15,16,8,255}, {15,23,16,255},
- {16,25,17,255}, {16,24,25,255}, {17,26,18,255}, {17,25,26,255}, {18,27,19,2}, {18,26,27,2}, {19,28,20,2}, {19,27,28,2},
- {20,29,21,2}, {20,28,29,2}, {21,30,22,2}, {21,29,30,2}, {22,31,23,255}, {22,30,31,255}, {23,24,16,255}, {23,31,24,255},
- {24,33,25,255}, {24,32,33,255}, {25,34,26,255}, {25,33,34,255}, {26,35,27,2}, {26,34,35,2}, {27,36,28,2}, {27,35,36,2},
- {28,37,29,2}, {28,36,37,2}, {29,38,30,2}, {29,37,38,2}, {30,39,31,255}, {30,38,39,255}, {31,32,24,255}, {31,39,32,255},
- {32,41,33,255}, {32,40,41,255}, {33,42,34,255}, {33,41,42,255}, {34,43,35,2}, {34,42,43,255}, {35,44,36,2}, {35,43,44,2},
- {36,45,37,2}, {36,44,45,2}, {37,46,38,2}, {37,45,46,2}, {38,47,39,255}, {38,46,47,255}, {39,40,32,255}, {39,47,40,255},
- {0,1,48,255}, {1,2,48,255}, {2,3,48,2}, {3,4,48,2}, {4,5,48,2}, {5,6,48,2}, {6,7,48,255}, {7,0,48,255},
- {40,49,41,255}, {41,49,42,255}, {42,49,43,255}, {43,49,44,2}, {44,49,45,2}, {45,49,46,2}, {46,49,47,255}, {47,49,40,255},
- {0,1,6,255}, {0,6,5,255}, {1,2,7,255}, {1,7,6,255}, {2,3,8,255}, {2,8,7,255}, {3,4,9,255}, {3,9,8,255},
- {5,6,11,255}, {5,11,10,255}, {6,7,12,255}, {6,12,11,255}, {7,8,13,255}, {7,13,12,255}, {8,9,14,255}, {8,14,13,255},
- {0,9,1,255}, {0,8,9,255}, {1,10,2,255}, {1,9,10,255}, {2,11,3,3}, {2,10,11,255}, {3,12,4,3}, {3,11,12,3},
+ {0,9,1,255}, {0,8,9,255}, {1,10,2,255}, {1,9,10,255}, {2,11,3,3}, {2,10,11,3}, {3,12,4,3}, {3,11,12,3},
{4,13,5,3}, {4,12,13,3}, {5,14,6,3}, {5,13,14,3}, {6,15,7,255}, {6,14,15,255}, {7,8,0,255}, {7,15,8,255},
- {8,17,9,255}, {8,16,17,255}, {9,18,10,255}, {9,17,18,255}, {10,19,11,3}, {10,18,19,255}, {11,20,12,3}, {11,19,20,3},
+ {8,17,9,255}, {8,16,17,255}, {9,18,10,255}, {9,17,18,255}, {10,19,11,3}, {10,18,19,3}, {11,20,12,3}, {11,19,20,3},
{12,21,13,3}, {12,20,21,3}, {13,22,14,3}, {13,21,22,3}, {14,23,15,255}, {14,22,23,255}, {15,16,8,255}, {15,23,16,255},
- {0,1,24,255}, {1,2,24,255}, {2,3,24,3}, {3,4,24,3}, {4,5,24,3}, {5,6,24,255}, {6,7,24,255}, {7,0,24,255},
- {16,25,17,255}, {17,25,18,255}, {18,25,19,255}, {19,25,20,3}, {20,25,21,3}, {21,25,22,3}, {22,25,23,255}, {23,25,16,255},
+ {16,25,17,255}, {16,24,25,255}, {17,26,18,255}, {17,25,26,255}, {18,27,19,3}, {18,26,27,3}, {19,28,20,3}, {19,27,28,3},
+ {20,29,21,3}, {20,28,29,3}, {21,30,22,3}, {21,29,30,3}, {22,31,23,255}, {22,30,31,255}, {23,24,16,255}, {23,31,24,255},
+ {24,33,25,255}, {24,32,33,255}, {25,34,26,255}, {25,33,34,255}, {26,35,27,3}, {26,34,35,3}, {27,36,28,3}, {27,35,36,3},
+ {28,37,29,3}, {28,36,37,3}, {29,38,30,3}, {29,37,38,3}, {30,39,31,255}, {30,38,39,255}, {31,32,24,255}, {31,39,32,255},
+ {32,41,33,255}, {32,40,41,255}, {33,42,34,255}, {33,41,42,255}, {34,43,35,3}, {34,42,43,255}, {35,44,36,3}, {35,43,44,3},
+ {36,45,37,3}, {36,44,45,3}, {37,46,38,3}, {37,45,46,3}, {38,47,39,255}, {38,46,47,255}, {39,40,32,255}, {39,47,40,255},
+ {0,1,48,255}, {1,2,48,255}, {2,3,48,3}, {3,4,48,3}, {4,5,48,3}, {5,6,48,3}, {6,7,48,255}, {7,0,48,255},
+ {40,49,41,255}, {41,49,42,255}, {42,49,43,255}, {43,49,44,3}, {44,49,45,3}, {45,49,46,3}, {46,49,47,255}, {47,49,40,255},
+ {0,1,6,255}, {0,6,5,255}, {1,2,7,255}, {1,7,6,255}, {2,3,8,255}, {2,8,7,255}, {3,4,9,255}, {3,9,8,255},
+ {5,6,11,255}, {5,11,10,255}, {6,7,12,255}, {6,12,11,255}, {7,8,13,255}, {7,13,12,255}, {8,9,14,255}, {8,14,13,255},
+ {0,9,1,255}, {0,8,9,255}, {1,10,2,255}, {1,9,10,255}, {2,11,3,4}, {2,10,11,255}, {3,12,4,4}, {3,11,12,4},
+ {4,13,5,4}, {4,12,13,4}, {5,14,6,4}, {5,13,14,4}, {6,15,7,255}, {6,14,15,255}, {7,8,0,255}, {7,15,8,255},
+ {8,17,9,255}, {8,16,17,255}, {9,18,10,255}, {9,17,18,255}, {10,19,11,4}, {10,18,19,255}, {11,20,12,4}, {11,19,20,4},
+ {12,21,13,4}, {12,20,21,4}, {13,22,14,4}, {13,21,22,4}, {14,23,15,255}, {14,22,23,255}, {15,16,8,255}, {15,23,16,255},
+ {0,1,24,255}, {1,2,24,255}, {2,3,24,4}, {3,4,24,4}, {4,5,24,4}, {5,6,24,255}, {6,7,24,255}, {7,0,24,255},
+ {16,25,17,255}, {17,25,18,255}, {18,25,19,255}, {19,25,20,4}, {20,25,21,4}, {21,25,22,4}, {22,25,23,255}, {23,25,16,255},
{0,7,1,255}, {0,6,7,255}, {1,8,2,255}, {1,7,8,255}, {2,9,3,255}, {2,8,9,255}, {3,10,4,255}, {3,9,10,255},
{4,11,5,255}, {4,10,11,255}, {5,6,0,255}, {5,11,6,255}, {6,13,7,255}, {6,12,13,255}, {7,14,8,255}, {7,13,14,255},
{8,15,9,255}, {8,14,15,255}, {9,16,10,255}, {9,15,16,255}, {10,17,11,255}, {10,16,17,255}, {11,12,6,255}, {11,17,12,255},
{12,19,13,255}, {12,18,19,255}, {13,20,14,255}, {13,19,20,255}, {14,21,15,255}, {14,20,21,255}, {15,22,16,255}, {15,21,22,255},
- {16,23,17,255}, {16,22,23,255}, {17,18,12,255}, {17,23,18,255}, {18,25,19,4}, {18,24,25,255}, {19,26,20,5}, {19,25,26,6},
- {20,27,21,7}, {20,26,27,7}, {21,28,22,7}, {21,27,28,7}, {22,29,23,8}, {22,28,29,9}, {23,24,18,255}, {23,29,24,10},
- {24,31,25,11}, {24,30,31,255}, {25,32,26,12}, {25,31,32,13}, {26,33,27,7}, {26,32,33,7}, {27,34,28,7}, {27,33,34,7},
- {28,35,29,14}, {28,34,35,15}, {29,30,24,255}, {29,35,30,16}, {30,37,31,17}, {30,36,37,255}, {31,38,32,18}, {31,37,38,19},
- {32,39,33,7}, {32,38,39,7}, {33,40,34,7}, {33,39,40,7}, {34,41,35,20}, {34,40,41,21}, {35,36,30,255}, {35,41,36,22},
- {0,1,42,255}, {1,2,42,255}, {2,3,42,255}, {3,4,42,255}, {4,5,42,255}, {5,0,42,255}, {36,43,37,255}, {37,43,38,23},
- {38,43,39,255}, {39,43,40,7}, {40,43,41,24}, {41,43,36,255}, {0,7,1,255}, {0,6,7,255}, {1,8,2,255}, {1,7,8,255},
+ {16,23,17,255}, {16,22,23,255}, {17,18,12,255}, {17,23,18,255}, {18,25,19,5}, {18,24,25,255}, {19,26,20,6}, {19,25,26,7},
+ {20,27,21,8}, {20,26,27,8}, {21,28,22,8}, {21,27,28,8}, {22,29,23,9}, {22,28,29,10}, {23,24,18,255}, {23,29,24,11},
+ {24,31,25,12}, {24,30,31,255}, {25,32,26,13}, {25,31,32,14}, {26,33,27,8}, {26,32,33,8}, {27,34,28,8}, {27,33,34,8},
+ {28,35,29,15}, {28,34,35,16}, {29,30,24,255}, {29,35,30,17}, {30,37,31,18}, {30,36,37,255}, {31,38,32,19}, {31,37,38,20},
+ {32,39,33,8}, {32,38,39,8}, {33,40,34,8}, {33,39,40,8}, {34,41,35,21}, {34,40,41,22}, {35,36,30,255}, {35,41,36,23},
+ {0,1,42,255}, {1,2,42,255}, {2,3,42,255}, {3,4,42,255}, {4,5,42,255}, {5,0,42,255}, {36,43,37,255}, {37,43,38,24},
+ {38,43,39,255}, {39,43,40,8}, {40,43,41,25}, {41,43,36,255}, {0,7,1,255}, {0,6,7,255}, {1,8,2,255}, {1,7,8,255},
{2,9,3,255}, {2,8,9,255}, {3,10,4,255}, {3,9,10,255}, {4,11,5,255}, {4,10,11,255}, {5,6,0,255}, {5,11,6,255},
{6,13,7,255}, {6,12,13,255}, {7,14,8,255}, {7,13,14,255}, {8,15,9,255}, {8,14,15,255}, {9,16,10,255}, {9,15,16,255},
{10,17,11,255}, {10,16,17,255}, {11,12,6,255}, {11,17,12,255}, {12,19,13,255}, {12,18,19,255}, {13,20,14,255}, {13,19,20,255},
{14,21,15,255}, {14,20,21,255}, {15,22,16,255}, {15,21,22,255}, {16,23,17,255}, {16,22,23,255}, {17,18,12,255}, {17,23,18,255},
- {18,25,19,25}, {18,24,25,255}, {19,26,20,25}, {19,25,26,26}, {20,27,21,7}, {20,26,27,7}, {21,28,22,7}, {21,27,28,7},
- {22,29,23,27}, {22,28,29,28}, {23,24,18,255}, {23,29,24,29}, {24,31,25,30}, {24,30,31,255}, {25,32,26,31}, {25,31,32,32},
- {26,33,27,7}, {26,32,33,7}, {27,34,28,7}, {27,33,34,7}, {28,35,29,33}, {28,34,35,34}, {29,30,24,255}, {29,35,30,35},
- {30,37,31,36}, {30,36,37,255}, {31,38,32,37}, {31,37,38,38}, {32,39,33,7}, {32,38,39,7}, {33,40,34,7}, {33,39,40,7},
- {34,41,35,39}, {34,40,41,40}, {35,36,30,255}, {35,41,36,41}, {0,1,42,255}, {1,2,42,255}, {2,3,42,255}, {3,4,42,255},
- {4,5,42,255}, {5,0,42,255}, {36,43,37,255}, {37,43,38,42}, {38,43,39,255}, {39,43,40,7}, {40,43,41,43}, {41,43,36,255},
+ {18,25,19,26}, {18,24,25,255}, {19,26,20,26}, {19,25,26,27}, {20,27,21,8}, {20,26,27,8}, {21,28,22,8}, {21,27,28,8},
+ {22,29,23,28}, {22,28,29,29}, {23,24,18,255}, {23,29,24,30}, {24,31,25,31}, {24,30,31,255}, {25,32,26,32}, {25,31,32,33},
+ {26,33,27,8}, {26,32,33,8}, {27,34,28,8}, {27,33,34,8}, {28,35,29,34}, {28,34,35,35}, {29,30,24,255}, {29,35,30,36},
+ {30,37,31,37}, {30,36,37,255}, {31,38,32,38}, {31,37,38,39}, {32,39,33,8}, {32,38,39,8}, {33,40,34,8}, {33,39,40,8},
+ {34,41,35,40}, {34,40,41,41}, {35,36,30,255}, {35,41,36,42}, {0,1,42,255}, {1,2,42,255}, {2,3,42,255}, {3,4,42,255},
+ {4,5,42,255}, {5,0,42,255}, {36,43,37,255}, {37,43,38,43}, {38,43,39,255}, {39,43,40,8}, {40,43,41,44}, {41,43,36,255},
{0,1,6,255}, {0,6,5,255}, {1,2,7,255}, {1,7,6,255}, {2,3,8,255}, {2,8,7,255}, {3,4,9,255}, {3,9,8,255},
{4,0,5,255}, {4,5,9,255}, {5,6,11,255}, {5,11,10,255}, {6,7,12,255}, {6,12,11,255}, {7,8,13,255}, {7,13,12,255},
{8,9,14,255}, {8,14,13,255}, {9,5,10,255}, {9,10,14,255}, {10,11,16,255}, {10,16,15,255}, {11,12,17,255}, {11,17,16,255},
@@ -1380,11 +1380,11 @@ static const Tri jake_lo_t[624] = {
{2,3,30,255}, {3,4,30,255}, {4,0,30,255}, {25,31,26,255}, {26,31,27,255}, {27,31,28,255}, {28,31,29,255}, {29,31,25,255},
};
static const MPart jake_lo_p[9] = {{0,83,0,162,1}, {83,21,162,14,-1}, {104,50,176,96,0}, {154,15,272,16,1}, {169,26,288,48,0}, {195,44,336,84,0}, {239,44,420,84,0}, {283,32,504,60,0}, {315,32,564,60,0},};
-static const uint16_t jake_lo_pal[44] = {
- 10240,57050,29944,8713,65238,63223,52594,61275,65206,47200,47200,40775,
- 30243,38630,40839,40743,40775,63291,61146,50644,63323,48498,48498,52725,
- 50676,65142,47200,65239,54609,49345,40839,40839,40742,34468,38630,40774,
- 61210,63291,48531,61210,50612,48498,52658,52659,
+static const uint16_t jake_lo_pal[45] = {
+ 10240,61209,52757,29944,8713,65238,63223,52594,61275,65206,47200,47200,
+ 40775,30243,38630,40839,40743,40775,63291,61146,50644,63323,48498,48498,
+ 52725,50676,65142,47200,65239,54609,49345,40839,40839,40742,34468,38630,
+ 40774,61210,63291,48531,61210,50612,48498,52658,52659,
};
static const int16_t jake_lo_j[11][3] = {{0,761,0}, {0,794,0}, {0,1188,0}, {-157,1132,0}, {-415,1132,0}, {157,1132,0}, {415,1132,0}, {-132,741,0}, {-132,450,0}, {125,741,0}, {125,450,0}};
static const int8_t jake_lo_parent[11] = {-1,0,1,1,3,1,5,0,7,0,9};
diff --git a/games/subway/tools/models.py b/games/subway/tools/models.py
index 4328aae4..94973dc8 100644
--- a/games/subway/tools/models.py
+++ b/games/subway/tools/models.py
@@ -34,7 +34,8 @@ PEOPLE = {
arms=(186, 226), clip=56, elbow=118, wrist=166, depth=dict(head=0.98, chest=0.62, hips=0.72),
peak=dict(row=95, colour=(450, 106), size=(0.13, 0.11)),
shoe=(236, 232, 222), logo=dict(box=(455, 33, 550, 66), row=258, width=0.3, height=0.2),
- back=[("head", 0, 999, (222, 218, 208)), ("chest", 0, 999, (118, 158, 198)), ("hips", 0, 999, (480, 315))]),
+ back=[("head", 0, 176, (236, 226, 204)), ("head", 176, 999, (206, 194, 172)), ("chest", 0, 999, (118, 158, 198)),
+ ("hips", 0, 999, (480, 315))]),
"tricky": dict(src="3D_Models_5_Trickys.jpg", x=(250, 760), cx=505, height=1.72,
head=(18, 200), neck=192, chest=(198, 290), waist=290, knee=420, ankle=468,
arms=(182, 210), clip=56, elbow=120, wrist=196, depth=dict(head=0.95, chest=0.7, hips=0.75),