Remove some colors that are reserved for accent colors

This commit is contained in:
2026-03-15 01:12:52 -04:00
parent cadf928cc2
commit f83b291479
2 changed files with 55 additions and 43 deletions

View File

@@ -439,6 +439,28 @@
], ],
"type": "bitmap" "type": "bitmap"
}, },
{
"file": "images/b024.png",
"memoryFormat": "Smallest",
"name": "B024",
"spaceOptimization": "storage",
"targetPlatforms": [
"emery",
"gabbro"
],
"type": "bitmap"
},
{
"file": "images/b025.png",
"memoryFormat": "Smallest",
"name": "B025",
"spaceOptimization": "storage",
"targetPlatforms": [
"emery",
"gabbro"
],
"type": "bitmap"
},
{ {
"file": "images/h023.png", "file": "images/h023.png",
"memoryFormat": "Smallest", "memoryFormat": "Smallest",
@@ -450,6 +472,28 @@
], ],
"type": "bitmap" "type": "bitmap"
}, },
{
"file": "images/h024.png",
"memoryFormat": "Smallest",
"name": "H024",
"spaceOptimization": "storage",
"targetPlatforms": [
"emery",
"gabbro"
],
"type": "bitmap"
},
{
"file": "images/h025.png",
"memoryFormat": "Smallest",
"name": "H025",
"spaceOptimization": "storage",
"targetPlatforms": [
"emery",
"gabbro"
],
"type": "bitmap"
},
{ {
"file": "images/xb001.png", "file": "images/xb001.png",
"memoryFormat": "Smallest", "memoryFormat": "Smallest",
@@ -461,39 +505,6 @@
], ],
"type": "bitmap" "type": "bitmap"
}, },
{
"file": "images/xb002.png",
"memoryFormat": "Smallest",
"name": "XB002",
"spaceOptimization": "storage",
"targetPlatforms": [
"emery",
"gabbro"
],
"type": "bitmap"
},
{
"file": "images/xb003.png",
"memoryFormat": "Smallest",
"name": "XB003",
"spaceOptimization": "storage",
"targetPlatforms": [
"emery",
"gabbro"
],
"type": "bitmap"
},
{
"file": "images/xb004.png",
"memoryFormat": "Smallest",
"name": "XB004",
"spaceOptimization": "storage",
"targetPlatforms": [
"emery",
"gabbro"
],
"type": "bitmap"
},
{ {
"file": "images/h017.png", "file": "images/h017.png",
"memoryFormat": "Smallest", "memoryFormat": "Smallest",

View File

@@ -22,39 +22,40 @@ static GRect s_guy_butt_grect_on = GRect(PBL_IF_ROUND_ELSE(0, -30), PBL_IF_ROUND
static GRect s_guy_butt_grect_off = GRect(PBL_IF_ROUND_ELSE(260, 170), PBL_IF_ROUND_ELSE(145, 129), 260, 115); static GRect s_guy_butt_grect_off = GRect(PBL_IF_ROUND_ELSE(260, 170), PBL_IF_ROUND_ELSE(145, 129), 260, 115);
// declare lookup tables // declare lookup tables
static const uint8_t s_head_count = 23; static const uint8_t s_head_count = 25;
static const uint32_t s_random_heads[] = { static const uint32_t s_random_heads[] = {
RESOURCE_ID_H001, RESOURCE_ID_H002, RESOURCE_ID_H003, RESOURCE_ID_H004, RESOURCE_ID_H001, RESOURCE_ID_H002, RESOURCE_ID_H003, RESOURCE_ID_H004,
RESOURCE_ID_H005, RESOURCE_ID_H006, RESOURCE_ID_H007, RESOURCE_ID_H008, RESOURCE_ID_H005, RESOURCE_ID_H006, RESOURCE_ID_H007, RESOURCE_ID_H008,
RESOURCE_ID_H009, RESOURCE_ID_H010, RESOURCE_ID_H011, RESOURCE_ID_H012, RESOURCE_ID_H009, RESOURCE_ID_H010, RESOURCE_ID_H011, RESOURCE_ID_H012,
RESOURCE_ID_H013, RESOURCE_ID_H014, RESOURCE_ID_H015, RESOURCE_ID_H016, RESOURCE_ID_H013, RESOURCE_ID_H014, RESOURCE_ID_H015, RESOURCE_ID_H016,
RESOURCE_ID_H017, RESOURCE_ID_H018, RESOURCE_ID_H019, RESOURCE_ID_H020, RESOURCE_ID_H017, RESOURCE_ID_H018, RESOURCE_ID_H019, RESOURCE_ID_H020,
RESOURCE_ID_H021, RESOURCE_ID_H022, RESOURCE_ID_H023}; RESOURCE_ID_H021, RESOURCE_ID_H022, RESOURCE_ID_H023, RESOURCE_ID_H024,
static const uint8_t s_butt_count = 27; RESOURCE_ID_H025};
static const uint8_t s_butt_count = 26;
static const uint32_t s_random_butts[] = { static const uint32_t s_random_butts[] = {
RESOURCE_ID_B001, RESOURCE_ID_B002, RESOURCE_ID_B003, RESOURCE_ID_B004, RESOURCE_ID_B001, RESOURCE_ID_B002, RESOURCE_ID_B003, RESOURCE_ID_B004,
RESOURCE_ID_B005, RESOURCE_ID_B006, RESOURCE_ID_B007, RESOURCE_ID_B008, RESOURCE_ID_B005, RESOURCE_ID_B006, RESOURCE_ID_B007, RESOURCE_ID_B008,
RESOURCE_ID_B009, RESOURCE_ID_B010, RESOURCE_ID_B011, RESOURCE_ID_B012, RESOURCE_ID_B009, RESOURCE_ID_B010, RESOURCE_ID_B011, RESOURCE_ID_B012,
RESOURCE_ID_B013, RESOURCE_ID_B014, RESOURCE_ID_B015, RESOURCE_ID_B016, RESOURCE_ID_B013, RESOURCE_ID_B014, RESOURCE_ID_B015, RESOURCE_ID_B016,
RESOURCE_ID_B017, RESOURCE_ID_B018, RESOURCE_ID_B019, RESOURCE_ID_B020, RESOURCE_ID_B017, RESOURCE_ID_B018, RESOURCE_ID_B019, RESOURCE_ID_B020,
RESOURCE_ID_B021, RESOURCE_ID_B022, RESOURCE_ID_B023, RESOURCE_ID_XB001, RESOURCE_ID_B021, RESOURCE_ID_B022, RESOURCE_ID_B023, RESOURCE_ID_B024,
RESOURCE_ID_XB002, RESOURCE_ID_XB003, RESOURCE_ID_XB004}; RESOURCE_ID_B025, RESOURCE_ID_XB001};
static const uint8_t s_color_count = 22; static const uint8_t s_color_count = 20;
static const GColor8 s_dark_bg_colors[] = { static const GColor8 s_dark_bg_colors[] = {
// Red // Red
GColorFolly, GColorRed, GColorFolly, GColorRed,
// Orange // Orange
GColorOrange, GColorRajah, GColorSunsetOrange, GColorOrange, GColorRajah,
// Yellow // Yellow
GColorChromeYellow, GColorIcterine, GColorPastelYellow, GColorYellow, GColorIcterine, GColorPastelYellow, GColorYellow,
// Green // Green
GColorInchworm, GColorJaegerGreen, GColorKellyGreen, GColorMintGreen, GColorInchworm, GColorJaegerGreen, GColorKellyGreen, GColorMintGreen,
// Blue // Blue
GColorElectricBlue, GColorTiffanyBlue, GColorVividCerulean, GColorElectricBlue, GColorTiffanyBlue, GColorVividCerulean,
// Purple // Purple
GColorLavenderIndigo, GColorPurpureus, GColorRichBrilliantLavender, GColorLavenderIndigo, GColorPurpureus,
// Pink // Pink
GColorBrilliantRose, GColorMelon, GColorBrilliantRose, GColorMelon, GColorShockingPink,
// Brown // Brown
GColorRoseVale}; GColorRoseVale};