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.
C calculatorcalculator-gamescasiochesscrossy-roaddrive-madfx-cg50gamesgeometry-dashgraphing-calculatorndlessnumworksnumworks-appsnumworks-calculatornumworks-gamenumworks-gamestetristi-84-plus-ceti-nspire
Hollow Knight: King's Pass lore tablets, focus tutorial, tight sprites drawn in place
Mason Chen51b0633e2b75
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.binindex cf0b1bca..2bf76e64 100644Binary files a/games/hollowknight/src/data.bin and b/games/hollowknight/src/data.bin differdiff --git a/games/hollowknight/src/data.h b/games/hollowknight/src/data.hindex ca32f7ea..14498907 100644--- a/games/hollowknight/src/data.h+++ b/games/hollowknight/src/data.h@@ -658,7 +658,7 @@#define SPRITE_CORPSE_NAIL 2934#define SPRITE_FK_BARREL 2935#define SPRITE_FK_STAFF 2936-#define SPRITE_DIGIT0 3357+#define SPRITE_DIGIT0 3367#define STYLE_DIALOGUE 0#define STYLE_PROMPT 1#define STYLE_TITLE_L 2@@ -707,20 +707,20 @@#define EK_HORNET 29#define NUM_KINDS 30#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 200, 199, -1, -1, -1, -1, -1, -1, -1, -1, 202, 203}}, {EF_BUZZER, {205, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 207, 208}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 215, 214, -1, -1, -1, -1, -1, -1, -1, 212, 213}}, {EF_BOUNCER, {-1, -1, -1, 218, -1, -1, -1, -1, -1, -1, -1, 216, 217}}, {EF_SPITTER, {-1, -1, -1, 221, 222, 220, -1, -1, -1, -1, -1, 219, -1}}, {EF_ROLLER, {225, -1, -1, 227, 226, 228, -1, -1, -1, -1, -1, 223, 224}}, {EF_BLOCKER, {235, -1, -1, 231, 236, 229, 230, 237, 238, 234, 233, -1, 232}}, {EF_HUSK, {244, 245, 246, 239, 241, 240, -1, -1, -1, -1, -1, 242, 243}}, {EF_HUSK, {252, 253, 254, 247, 249, 248, -1, -1, -1, -1, -1, 250, 251}}, {EF_HUSK, {260, 261, 262, 255, 257, 256, -1, -1, -1, -1, -1, 258, 259}}, {EF_HUSK, {268, 269, 270, 263, 265, 264, -1, -1, -1, -1, -1, 266, 267}}, {EF_LEAPER, {274, 276, 277, 271, 275, -1, -1, -1, -1, -1, -1, 272, 273}}, {EF_GUARD, {283, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 280, 281}}, {EF_FK, {305, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 303}}, {EF_FKHEAD, {325, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 323}}, {EF_HATCHER, {-1, -1, -1, 330, 329, -1, -1, -1, -1, -1, -1, 327, 328}}, {EF_HATCHLING, {-1, -1, -1, 331, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {337, -1, -1, 335, 336, 339, 338, 332, -1, -1, -1, 333, 334}}, {EF_GFLY, {352, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 361, 362, 360, 356, 357, -1, -1, -1, -1, -1, 358, 359}}, {EF_PIGEON, {-1, -1, -1, 364, 365, 366, 363, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {368, -1, -1, 371, 370, 369, -1, -1, -1, -1, -1, 367, -1}}, {EF_SHAKER, {375, 376, 377, 372, -1, -1, -1, -1, -1, -1, -1, 373, 374}}, {EF_MOSQUITO, {382, -1, -1, 384, 383, 379, 378, -1, -1, -1, -1, 380, 381}}, {EF_FATFLY, {388, -1, -1, 385, -1, -1, -1, -1, -1, -1, -1, 386, 387}}, {EF_MOSSCHARGER, {-1, -1, -1, 389, 390, 393, 396, 395, 397, 394, -1, 391, 392}}, {EF_MOSSKNIGHT, {403, 418, 422, -1, -1, -1, -1, -1, -1, -1, -1, 398, 399}}, {EF_HORNET, {438, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 426, -1}}}-#define TXT_PROMPT_LISTEN 91-#define TXT_PROMPT_REST 92-#define TXT_PROMPT_INSPECT 93-#define TXT_PROMPT_ENTER 94-#define TXT_PROMPT_SIT 95-#define TXT_PROMPT_SHOP 96-#define TXT_PROMPT_TRAVEL 97-#define TXT_PROMPT_ASCEND 98-#define TXT_PROMPT_DESCEND 99-#define TXT_PROMPT_EXIT 100-#define TXT_PROMPT_ACCEPT 101-#define TXT_PROMPT_TRADE 102-#define TXT_PROMPT_WATCH 103-#define TXT_PROMPT_CHALLENGE 104+#define TXT_PROMPT_LISTEN 96+#define TXT_PROMPT_REST 97+#define TXT_PROMPT_INSPECT 98+#define TXT_PROMPT_ENTER 99+#define TXT_PROMPT_SIT 100+#define TXT_PROMPT_SHOP 101+#define TXT_PROMPT_TRAVEL 102+#define TXT_PROMPT_ASCEND 103+#define TXT_PROMPT_DESCEND 104+#define TXT_PROMPT_EXIT 105+#define TXT_PROMPT_ACCEPT 106+#define TXT_PROMPT_TRADE 107+#define TXT_PROMPT_WATCH 108+#define TXT_PROMPT_CHALLENGE 109#define PROMPT_SORT 884737u#define DIGIT_ADV {0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f}#define VMOP_NOP 1@@ -849,6 +849,11 @@#define VMOP_SOULORBS 124#define VMOP_FADETO 125#define VMOP_SETBENCHRESPAWN 126+#define VMOP_FADECOLORFADER 127+#define VMOP_BOOLNONETRUE 128+#define VMOP_DIALOGUEPLACE 129+#define VMOP_STOPPAUSE 130+#define VMOP_GETFSMBOOL 131#define VMEV_FINISHED 0#define VMEV_CONVO_FINISH 1#define VMEV_CONVO_START 2@@ -891,11 +896,13 @@#define VMEV_RESET 39#define VMEV_HIT 40#define VMEV_UNCOVER 41+#define VMEV_UP 42+#define VMEV_DOWN 43#define VMSTR_NPC_TITLE 14-#define VMSTR_VISITED 578-#define VMSTR_DISPLAY_RIGHT 579+#define VMSTR_VISITED 599+#define VMSTR_DISPLAY_RIGHT 600#define VMSTR_HORNET_SAVER 201-#define VMSTR_ITEM 492+#define VMSTR_ITEM 509#define STR_ATTACK_RANGE 23#define STR_EVADE_RANGE 49#define STR_SPIT_RANGE 50@@ -924,7 +931,7 @@#define TITLE_TISO_NC 18#define TITLE_CHARM_SLUG 19#define NUM_TITLES 20-#define TITLE_TABLE {{105, 106, -1, -1}, {107, 108, 109, -1}, {110, 111, -1, 112}, {113, 114, -1, 115}, {116, 117, -1, 118}, {119, 120, -1, -1}, {121, 122, 123, -1}, {124, 125, -1, -1}, {126, 127, -1, -1}, {128, 129, -1, -1}, {130, 131, -1, -1}, {132, 133, -1, -1}, {134, 135, -1, -1}, {136, 137, -1, -1}, {138, 139, -1, 140}, {141, 142, -1, 143}, {141, 142, -1, 144}, {145, 146, 147, -1}, {145, 146, -1, -1}, {148, 149, -1, 150}}+#define TITLE_TABLE {{110, 111, -1, -1}, {112, 113, 114, -1}, {115, 116, -1, 117}, {118, 119, -1, 120}, {121, 122, -1, 123}, {124, 125, -1, -1}, {126, 127, 128, -1}, {129, 130, -1, -1}, {131, 132, -1, -1}, {133, 134, -1, -1}, {135, 136, -1, -1}, {137, 138, -1, -1}, {139, 140, -1, -1}, {141, 142, -1, -1}, {143, 144, -1, 145}, {146, 147, -1, 148}, {146, 147, -1, 149}, {150, 151, 152, -1}, {150, 151, -1, -1}, {153, 154, -1, 155}}#define SPRITE_FLEUR_TOP 2937#define FLEUR_TOP_RECTS {{0.781f, -0.844f, 0.953f, -0.688f}, {-1.078f, -0.984f, 1.141f, -0.531f}, {-1.281f, -1.016f, 1.313f, -0.484f}, {-1.359f, -1.016f, 1.969f, -0.141f}, {-2.141f, -1.031f, 2.531f, 0.047f}, {-2.250f, -1.078f, 2.766f, 0.266f}, {-2.797f, -1.203f, 3.094f, 0.578f}, {-2.938f, -1.219f, 3.219f, 0.859f}, {-3.203f, -1.234f, 3.469f, 1.141f}, {-3.312f, -1.234f, 3.766f, 1.281f}, {-3.547f, -1.250f, 4.000f, 1.328f}, {-3.844f, -1.250f, 4.016f, 1.328f}, {-4.016f, -1.250f, 4.031f, 1.344f}, {-4.031f, -1.250f, 4.031f, 1.344f}, {-4.047f, -1.250f, 4.031f, 1.359f}, {-4.047f, -1.250f, 4.031f, 1.359f}, {-4.047f, -1.266f, 4.031f, 1.359f}, {-4.047f, -1.266f, 4.031f, 1.359f}, {-4.062f, -1.266f, 4.047f, 1.375f}, {-4.062f, -1.266f, 4.047f, 1.375f}, {-4.062f, -1.266f, 4.047f, 1.375f}, {-4.062f, -1.266f, 4.047f, 1.375f}}#define FLEUR_FRAMES 22@@ -940,53 +947,56 @@#define SPRITE_GRASS_BALL 2945#define SPRITE_SOUL_ORB 2946#define SOUL_ORB_SORT {13, 0}-#define MSG_TABLE {{151, 152, 153, 154, 155, 156}, {157, 158, 159, 160, 161, 162}}+#define MSG_TABLE {{156, 157, 158, 159, 160, 161}, {162, 163, 164, 165, 166, 167}}#define NOTICE_BACKBOARD {2947, 1.0000f, 0.6931f}#define TUTE_FLEUR {2941, 1.0000f, 1.0000f}#define TUTE_BACKBOARD {2948, 1.0000f, 0.9560f}#define TUTE_IMAGE {2949, 1.0000f, 1.0000f}#define TUTE_STOP {2940, 1.0000f, 1.0000f}-#define NOTICE_ICONS {2950, 2951, 2952}+#define FOCUS_PROMPT_BG {2950, 0.0000f, -1.7900f, 1.0000f, 1.0000f}+#define FOCUS_PROMPT_TEXTS {{168, 0.1765f, -2.3773f, 0}, {169, 0.1765f, -3.1983f, 0}, {170, -0.0488f, -4.1348f, 1}, {171, 0.2240f, -5.2114f, 0}}+#define FOCUS_PROMPT_KEY {161, 0.4659f, -4.4341f}+#define NOTICE_ICONS {2951, 2952, 2953}#define CHARM_ICON_K 1.5000f-#define CHARM_ICONS {-1, 2953, 2954, 2955, 2956, -1, 2957, 2958, 2959, -1, -1, -1, -1, -1, 2960, -1, -1, -1, 2961, 2962, 2963, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define CHARM_NAMES {-1, 163, 164, 165, 166, -1, 167, 168, 169, -1, -1, -1, -1, -1, 170, -1, -1, -1, 171, 172, 173, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define TXT_CHARM_TUTE_TITLE 174-#define TXT_CHARM_TUTE_SUB 175-#define TXT_CHARM_REMINDER 176-#define TXT_YN_YES 177-#define TXT_YN_NO 178-#define TXT_YN_NOT_ENOUGH 179-#define MENU_LOGO {2964, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CHARM_ICONS {-1, 2954, 2955, 2956, 2957, -1, 2958, 2959, 2960, -1, -1, -1, -1, -1, 2961, -1, -1, -1, 2962, 2963, 2964, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CHARM_NAMES {-1, 172, 173, 174, 175, -1, 176, 177, 178, -1, -1, -1, -1, -1, 179, -1, -1, -1, 180, 181, 182, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define TXT_CHARM_TUTE_TITLE 183+#define TXT_CHARM_TUTE_SUB 184+#define TXT_CHARM_REMINDER 185+#define TXT_YN_YES 186+#define TXT_YN_NO 187+#define TXT_YN_NOT_ENOUGH 188+#define MENU_LOGO {2965, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_LOGO_Y 3.6585f#define MENU_START_Y -1.4181f#define MENU_QUIT_Y -2.3582f-#define MENU_POINTER {2965, 0.0000f, 0.0000f, 1.0023f, 1.0000f}+#define MENU_POINTER {2966, 0.0000f, 0.0000f, 1.0023f, 1.0000f}#define MENU_POINTER_GAP 0.7525f#define MENU_PROFILES_TITLE_Y 6.4481f-#define MENU_PROFILES_FLEUR {2966, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_PROFILES_FLEUR {2967, 0.0000f, 0.0000f, 1.0000f, 1.0807f}#define MENU_PROFILES_FLEUR_Y 5.4077f#define MENU_SLOT_X -2.8186f#define MENU_SLOT_Y 3.1252f#define MENU_SLOT_DY -2.3269f-#define MENU_SLOT_ZONES {{2, {2967, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2968, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2969, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2970, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2971, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}+#define MENU_SLOT_ZONES {{2, {2968, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2969, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2970, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2971, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2972, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}#define MENU_SLOT_NZONES 5#define MENU_SLOT_BG_DY 0.0102f-#define MENU_SLOT_FLEUR {2972, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_FLEUR {2973, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_SLOT_FLEUR_X 0.0000f#define MENU_SLOT_FLEUR_Y 0.4512f-#define MENU_SLOT_SELECTOR {2973, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_SELECTOR {2974, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_SLOT_SELECTOR_X -0.1626f#define MENU_SLOT_SELECTOR_Y 0.0813f-#define MENU_SLOT_CURSOR {2974, 0.0000f, 0.0000f, 1.0000f, 1.0025f}+#define MENU_SLOT_CURSOR {2975, 0.0000f, 0.0000f, 1.0000f, 1.0025f}#define MENU_SLOT_CURSOR_X -8.2367f#define MENU_SLOT_CURSOR_Y 0.0000f-#define MENU_SLOT_ORB {2975, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_ORB {2976, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_SLOT_ORB_X -4.3089f#define MENU_SLOT_ORB_Y 0.1230f-#define MENU_SLOT_GEO {2976, 0.0000f, 0.0000f, 1.0039f, 1.0000f}+#define MENU_SLOT_GEO {2977, 0.0000f, 0.0000f, 1.0039f, 1.0000f}#define MENU_SLOT_GEO_X -3.6961f#define MENU_SLOT_GEO_Y -0.5395f-#define MENU_SLOT_HEALTH {2977, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_HEALTH {2978, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_SLOT_HEALTH_X -3.5916f#define MENU_SLOT_HEALTH_Y 0.3577f#define MENU_SLOT_CURSOR_X2 8.0334f@@ -1004,60 +1014,60 @@#define MENU_SLOT_YES_X 2.5813f#define MENU_SLOT_NO_X 6.2296f#define MENU_BACK_Y -5.5406f-#define MENU_PAUSE_TOP {2978, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_TOP {2979, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_TOP_Y 2.3653f-#define MENU_PAUSE_BOT {2979, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_BOT {2980, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_BOT_Y -1.8877f#define MENU_PAUSE_CONTINUE_Y 0.6428f#define MENU_PAUSE_QUIT_Y -0.4548f-#define TXT_MAIN_START 180-#define TXT_MAIN_QUIT 181-#define TXT_PROFILE_NEW_GAME 182-#define TXT_PROFILE_CLEAR_BUTTON 183-#define TXT_PROFILE_CLEAR_PROMPT 184-#define TXT_NAV_YES 185-#define TXT_NAV_NO 186-#define TXT_NAV_BACK 187-#define TXT_PAUSE_CONTINUE 188-#define TXT_PAUSE_MAIN 189-#define TXT_PROFILE_CORRUPTED 190-#define TXT_SCREEN_SAVE_PROFILES 191-#define TXT_ZONES {192, 193, 194, 195, 196}+#define TXT_MAIN_START 189+#define TXT_MAIN_QUIT 190+#define TXT_PROFILE_NEW_GAME 191+#define TXT_PROFILE_CLEAR_BUTTON 192+#define TXT_PROFILE_CLEAR_PROMPT 193+#define TXT_NAV_YES 194+#define TXT_NAV_NO 195+#define TXT_NAV_BACK 196+#define TXT_PAUSE_CONTINUE 197+#define TXT_PAUSE_MAIN 198+#define TXT_PROFILE_CORRUPTED 199+#define TXT_SCREEN_SAVE_PROFILES 200+#define TXT_ZONES {201, 202, 203, 204, 205}#define INV_X -4.0500f#define INV_Y 7.5500f-#define INV_BORDER {{2980, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2980, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2981, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2982, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2983, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2984, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}+#define INV_BORDER {{2981, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2981, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2982, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2983, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2984, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2985, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}#define INV_NBORDER 6-#define INV_FRAME {2985, 4.0479f, -7.1963f, 1.0f, 1.0f}-#define INV_ARROW_L {2986, -9.8300f, -7.2000f, 1.0000f, 1.0000f}-#define INV_ARROW_R {2986, 18.0300f, -7.2000f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_L {2987, -9.8600f, -0.4300f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_R {2987, 18.0400f, -0.4300f, 1.0000f, 1.0000f}+#define INV_FRAME {2986, 4.0479f, -7.1963f, 1.0f, 1.0f}+#define INV_ARROW_L {2987, -9.8300f, -7.2000f, 1.0000f, 1.0000f}+#define INV_ARROW_R {2987, 18.0300f, -7.2000f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_L {2988, -9.8600f, -0.4300f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_R {2988, 18.0400f, -0.4300f, 1.0000f, 1.0000f}#define INV_PANE_NAME {3.9500f, -0.0745f, 8.3290f}#define INV_PANE_NAME_L {-9.4745f, -0.0646f, 8.3290f}#define INV_PANE_NAME_R {17.6945f, -0.0646f, 8.3290f}-#define TXT_INV_PANES {199, 200, 201, 202}-#define CH_BB {2988, -7.9200f, -8.3700f, 1.0000f, 1.0000f}+#define TXT_INV_PANES {208, 209, 210, 211}+#define CH_BB {2989, -7.9200f, -8.3700f, 1.0000f, 1.0000f}#define CH_BB_POS {{-7.9200f, -8.3700f}, {-6.4200f, -8.3700f}, {-4.9200f, -8.3400f}, {-3.4200f, -8.3400f}, {-1.9200f, -8.3400f}, {-0.4200f, -8.3400f}, {1.0800f, -8.3400f}, {2.5800f, -8.3400f}, {4.0800f, -8.3400f}, {5.5800f, -8.3400f}, {-7.0100f, -9.7900f}, {-5.5100f, -9.7900f}, {-4.0100f, -9.7900f}, {-2.5100f, -9.7900f}, {-1.0100f, -9.7900f}, {0.4900f, -9.7900f}, {1.9900f, -9.7900f}, {3.4900f, -9.7900f}, {4.9900f, -9.7900f}, {6.4900f, -9.7900f}, {-7.9200f, -11.2600f}, {-6.4200f, -11.2600f}, {-4.9200f, -11.2600f}, {-3.4200f, -11.2600f}, {-1.9200f, -11.2600f}, {-0.4200f, -11.2600f}, {1.0800f, -11.2600f}, {2.5800f, -11.2600f}, {4.0800f, -11.2600f}, {5.5800f, -11.2600f}, {-7.0100f, -12.7200f}, {-5.5100f, -12.7200f}, {-4.0100f, -12.7200f}, {-2.5100f, -12.7200f}, {-1.0100f, -12.7200f}, {0.4900f, -12.7200f}, {1.9900f, -12.7200f}, {3.4900f, -12.7200f}, {4.9900f, -12.7200f}, {6.4900f, -12.7200f}}#define CH_BB_BOX {1.5002f, 1.4969f, -0.0257f, 0.0685f}#define CH_BB_CHARM {2, 1, 4, 20, 19, 21, 31, 37, 3, 35, 23, 24, 25, 33, 14, 15, 32, 18, 13, 6, 12, 5, 11, 10, 22, 7, 34, 8, 9, 27, 29, 17, 16, 28, 26, 39, 30, 38, 40, 36}-#define CH_GLOW {2989, 0.0500f, 0.0600f, 1.0000f, 0.9919f}+#define CH_GLOW {2990, 0.0500f, 0.0600f, 1.0000f, 0.9919f}#define CH_GLOW_A 0.6970f-#define CH_ICONS {-1, 2953, 2954, 2955, 2956, -1, 2957, 2958, 2959, -1, -1, -1, -1, -1, 2960, -1, -1, -1, 2961, 2962, 2963, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define CH_NEXT_DOT {2990, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_ICONS {-1, 2954, 2955, 2956, 2957, -1, 2958, 2959, 2960, -1, -1, -1, -1, -1, 2961, -1, -1, -1, 2962, 2963, 2964, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CH_NEXT_DOT {2991, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define CH_NEXT_DOT_BOX {1.2143f, 1.2736f, -0.0209f, 0.0123f}#define CH_EQ_BOX {1.4950f, 1.4950f, 0.0000f, 0.0000f}#define CH_TEXT_EQUIPPED {-8.1273f, -2.0957f, 5.4345f}-#define CH_NOTCH_FULL {2991, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define CH_NOTCH_EMPTY {2992, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_FULL {2992, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_EMPTY {2993, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define CH_NOTCH_X -7.8000f#define CH_NOTCH_Y -6.1600f#define CH_NOTCH_DX 0.8100f#define CH_NOTCH_FULL_RGB {255, 216, 0}#define CH_NOTCH_OVER_RGB {255, 36, 67}#define CH_TEXT_NOTCHES {-8.0272f, -5.0757f, 5.4345f}-#define CH_DIVIDER {2993, -0.8400f, -6.9300f, 1.0000f, 0.1591f}+#define CH_DIVIDER {2994, -0.8400f, -6.9300f, 1.0000f, 0.1591f}#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}-#define CH_COST_PIP {2991, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_COST_PIP {2992, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define CH_COST_X 11.2300f#define CH_COST_Y -3.6600f#define CH_COST_DX 0.7500f@@ -1066,59 +1076,59 @@#define CH_NAME {12.4800f, -2.2710f, 8.8867f}#define CH_DESC {8.0382f, -7.3673f, 8.8867f}#define CH_CONFIRM {15.7465f, -13.0221f, 15.3500f}-#define CH_CONFIRM_KEY {2994, 16.3208f, -13.2878f, 1.0f, 1.0f}+#define CH_CONFIRM_KEY {2995, 16.3208f, -13.2878f, 1.0f, 1.0f}#define CH_CONFIRM_KEY_W 0.6412f-#define CH_CURSOR {2995, 0.0000f, 0.0000f, 1.0000f, 0.9756f}+#define CH_CURSOR {2996, 0.0000f, 0.0000f, 1.0000f, 0.9756f}#define CH_CURSOR_K {1.0720f, 1.0458f}#define CH_CURSOR_CORNERS {{1.0000f, 1.0000f}, {-1.1000f, 1.0000f}, {1.0000f, -1.0089f}, {-1.1000f, -1.0089f}}-#define TXT_CHARM_TXT_EQUIPPED 203-#define TXT_CHARM_TXT_OVERCHARMED 204-#define TXT_CHARM_TXT_COST 205-#define TXT_CTRL_EQUIP 206-#define TXT_CTRL_UNEQUIP 207-#define TXT_CHARM_ALERT_NONE 208-#define TXT_CHARM_ALERT_NONE_BENCH 209-#define TXT_CHARM_NOTCHES 210-#define TXT_CHARM_NAMES_INV {-1, 211, 212, 213, 214, -1, 215, 216, 217, -1, -1, -1, -1, -1, 218, -1, -1, -1, 219, 220, 221, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define TXT_CHARM_DESCS {-1, 222, 223, 224, 225, -1, 226, 227, 228, -1, -1, -1, -1, -1, 229, -1, -1, -1, 230, 231, 232, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define TXT_KEY_OK 233-#define INV_FIXED {{2996, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2997, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2998, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2999, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {3000, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {3001, -5.7200f, -13.3200f, 1.0000f, 1.0000f}}-#define INV_FIXED_BG {{-1, 0, 0, 0, 0}, {-1, 0, 0, 0, 0}, {-1, 0, 0, 0, 0}, {3002, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {3003, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}+#define TXT_CHARM_TXT_EQUIPPED 212+#define TXT_CHARM_TXT_OVERCHARMED 213+#define TXT_CHARM_TXT_COST 214+#define TXT_CTRL_EQUIP 215+#define TXT_CTRL_UNEQUIP 216+#define TXT_CHARM_ALERT_NONE 217+#define TXT_CHARM_ALERT_NONE_BENCH 218+#define TXT_CHARM_NOTCHES 219+#define TXT_CHARM_NAMES_INV {-1, 220, 221, 222, 223, -1, 224, 225, 226, -1, -1, -1, -1, -1, 227, -1, -1, -1, 228, 229, 230, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define TXT_CHARM_DESCS {-1, 231, 232, 233, 234, -1, 235, 236, 237, -1, -1, -1, -1, -1, 238, -1, -1, -1, 239, 240, 241, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define TXT_KEY_OK 242+#define INV_FIXED {{2997, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2998, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2999, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {3000, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {3001, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {3002, -5.7200f, -13.3200f, 1.0000f, 1.0000f}}+#define INV_FIXED_BG {{-1, 0, 0, 0, 0}, {-1, 0, 0, 0, 0}, {-1, 0, 0, 0, 0}, {3003, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {3004, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}#define INV_FIXED_BOX {{1.9363f, 2.9287f, -0.0651f, 0.0923f}, {1.4420f, 1.4140f, -0.0546f, 0.0682f}, {1.6244f, 5.3245f, 0.0126f, 0.1884f}, {1.7500f, 1.7500f, 0.0000f, 0.0000f}, {1.8505f, 1.8756f, -0.0503f, 0.0629f}, {7.8215f, 1.4409f, 1.7816f, -0.0205f}}-#define INV_HEART_PIECES {{3004, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3005, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3006, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3007, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}-#define INV_VESSEL_PIECES {{3008, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {3009, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {3010, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}+#define INV_HEART_PIECES {{3005, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3006, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3007, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3008, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}+#define INV_VESSEL_PIECES {{3009, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {3010, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {3011, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}#define INV_GEO_TEXT {-4.8612f, -12.9979f, 1.6942f}#define INV_EQ_X 1.1000f#define INV_EQ_Y -3.8000f#define INV_EQ_DX 2.0800f#define INV_EQ_DY -2.1800f-#define INV_EQ {{3011, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3012, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3013, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3014, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3015, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3016, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}+#define INV_EQ {{3012, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3013, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3014, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3015, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3016, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3017, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}#define INV_EQ_BOX {{1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}}-#define INV_TRINKETS {{3017, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {3018, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {3019, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {3020, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}+#define INV_TRINKETS {{3018, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {3019, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {3020, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {3021, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}#define INV_TRINKET_BOX {{1.3970f, 1.7141f, 0.0000f, -0.1535f}, {1.3970f, 1.7141f, 0.0000f, -0.1535f}, {1.3970f, 1.7141f, 0.0000f, -0.1535f}, {1.2162f, 1.5101f, -0.0416f, -0.0832f}}#define INV_TRINKET_TEXT {0.3740f, -0.2538f, 1.3871f}-#define INV_TRINKET_BB {3021, 4.2400f, -10.8700f, 1.0000f, 1.0000f}-#define INV_DIVIDERS {{3022, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {3022, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}+#define INV_TRINKET_BB {3022, 4.2400f, -10.8700f, 1.0000f, 1.0000f}+#define INV_DIVIDERS {{3023, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {3023, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}#define INV_NAME {12.9500f, -1.9345f, 8.3290f}#define INV_DESC {9.2144f, -3.1678f, 7.6475f}-#define TXT_INV_HEART {{234, 235}, {236, 237}, {238, 239}, {236, 240}, {236, 241}, {242, 243}}-#define TXT_INV_VESSEL {{234, 235}, {244, 245}, {246, 247}, {244, 248}, {249, 250}}-#define TXT_INV_FIXED {{251, 252}, {253, 254}, {255, 256}, {257, 258}}-#define TXT_INV_EQ {{259, 260}, {261, 262}, {263, 264}, {265, 266}, {267, 268}, {269, 270}}-#define TXT_INV_QUILL {271, 272, 273, 274}-#define TXT_INV_TRINKETS {{275, 276}, {277, 278}, {279, 280}, {281, 282}}-#define SHOP_BACKBOARD {3023, 4.9000f, -0.3200f, 0.8667f, 1.0000f}-#define SHOP_MASK_TOP {3024, 5.1230f, 4.8800f, 1.0000f, 0.9013f}-#define SHOP_MASK_BOTTOM {3025, 5.1537f, -5.6200f, 1.0000f, 0.8820f}-#define SHOP_ARROW_U {3026, 1.7000f, 1.8900f, 1.0000f, 1.0000f}-#define SHOP_ARROW_D {3026, 1.7000f, -0.3800f, -1.0000f, 1.0000f}-#define SHOP_SELECTOR {3027, 1.7300f, 0.7600f, 0.9332f, 1.0000f}-#define SHOP_CONFIRM_GEO {3028, 4.2800f, 0.3400f, 1.0000f, 1.0000f}-#define SHOP_POINTER_L {3029, 3.6119f, -2.0798f, 1.0000f, 1.0000f}-#define SHOP_POINTER_R {3029, 6.6249f, -2.0798f, -1.0000f, 1.0000f}-#define SHOP_MASK_A {0, 0, 255, 255, 255, 255, 255, 254, 249, 230, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 81, 134, 182, 206, 226, 223, 0, 0, 0, 0, 0, 0}+#define TXT_INV_HEART {{243, 244}, {245, 246}, {247, 248}, {245, 249}, {245, 250}, {251, 252}}+#define TXT_INV_VESSEL {{243, 244}, {253, 254}, {255, 256}, {253, 257}, {258, 259}}+#define TXT_INV_FIXED {{260, 261}, {262, 263}, {264, 265}, {266, 267}}+#define TXT_INV_EQ {{268, 269}, {270, 271}, {272, 273}, {274, 275}, {276, 277}, {278, 279}}+#define TXT_INV_QUILL {280, 281, 282, 283}+#define TXT_INV_TRINKETS {{284, 285}, {286, 287}, {288, 289}, {290, 291}}+#define SHOP_BACKBOARD {3024, 4.9000f, -0.3200f, 0.8667f, 1.0000f}+#define SHOP_MASK_TOP {3025, 5.1230f, 4.8800f, 1.0000f, 0.9013f}+#define SHOP_MASK_BOTTOM {3026, 5.1537f, -5.6200f, 1.0000f, 0.8820f}+#define SHOP_ARROW_U {3027, 1.7000f, 1.8900f, 1.0000f, 1.0000f}+#define SHOP_ARROW_D {3027, 1.7000f, -0.3800f, -1.0000f, 1.0000f}+#define SHOP_SELECTOR {3028, 1.7300f, 0.7600f, 0.9332f, 1.0000f}+#define SHOP_CONFIRM_GEO {3029, 4.2800f, 0.3400f, 1.0000f, 1.0000f}+#define SHOP_POINTER_L {3030, 3.6119f, -2.0798f, 1.0000f, 1.0000f}+#define SHOP_POINTER_R {3030, 6.6249f, -2.0798f, -1.0000f, 1.0000f}+#define SHOP_MASK_A {0, 0, 255, 255, 255, 255, 255, 254, 249, 230, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 73, 134, 178, 204, 226, 223, 0, 0, 0, 0, 0, 0}#define SHOP_CONFIRM_ITEM {5.0900f, 2.4700f}-#define TXT_KEY_BACK 284+#define TXT_KEY_BACK 293#define SHOP_BACKBOARD_A 0.8910f#define SHOP_BORDERS {{5.1437f, 3.6600f, 1.1244f, 1.0000f, CLIP_SHOPUI_SHOP_MENU_TOP_UP, CLIP_SHOPUI_SHOP_MENU_TOP_DOWN, 0.0000f}, {5.1937f, -5.7000f, 1.1338f, 1.0000f, CLIP_SHOPUI_SHOP_MENU_BOTTOM_UP, CLIP_SHOPUI_SHOP_MENU_BOTTOM_DOWN, 0.0000f}}#define SHOP_FIGUREHEADS {{5.1437f, 6.6400f, 1.0000f, 1.0000f, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_UP, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_DOWN, 0.3500f}, {5.1437f, 6.7400f, 1.0000f, 1.0000f, CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_UP, CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_DOWN, 0.3500f}, {5.1437f, 6.8300f, 1.0000f, 1.0000f, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_UP, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_DOWN, 0.3500f}}@@ -1135,7 +1145,7 @@#define SHOP_T_ACT_CONFIRM {8.2400f, -6.4868f, 1.8022f}#define SHOP_T_ACT_CANCEL {2.0402f, -6.4868f, 1.8022f}#define SHOP_DESC_DY 1.6100f-#define SHOP_PEG {3030, 5.5100f, 2.5800f, 1.0000f, 1.0000f}+#define SHOP_PEG {3031, 5.5100f, 2.5800f, 1.0000f, 1.0000f}#define SHOP_PEG_DX 0.7500f#define SHOP_PEGS_X {1.9100f, 1.5400f, 1.1500f, 0.8000f, 0.3300f, 0.0000f}#define SHOP_KEY_CONFIRM {9.0416f, -6.7556f}@@ -1146,24 +1156,24 @@#define SHOP_ROW_TOP 4.9000f#define SHOP_ROW_BOTTOM -5.2500f#define SHOP_ARROW_BOB 0.1500f-#define TXT_SHOP_CTRL_BUY 287-#define TXT_SHOP_CTRL_EXIT 288-#define TXT_SHOP_CTRL_CONFIRM 289-#define TXT_SHOP_CTRL_CANCEL 290-#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 291-#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 292-#define TXT_SHOP_CHARM_TXT_NOTCHCOST 293-#define TXT_SHOP_YES 294-#define TXT_SHOP_NO 295+#define TXT_SHOP_CTRL_BUY 296+#define TXT_SHOP_CTRL_EXIT 297+#define TXT_SHOP_CTRL_CONFIRM 298+#define TXT_SHOP_CTRL_CANCEL 299+#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 300+#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 301+#define TXT_SHOP_CHARM_TXT_NOTCHCOST 302+#define TXT_SHOP_YES 303+#define TXT_SHOP_NO 304#define SHOP_DESC_BOTTOM -5.0500f-#define SHOP_ITEMS {{3032, 0.5714f, 296, 297, 150, 1, 125, -1, 0, 0}, {3032, 0.5714f, 296, 298, 500, 1, 126, 125, 0, 0}, {3033, 0.5714f, 299, 300, 550, 3, 127, -1, 0, 0}, {3034, 0.5714f, 301, 302, 950, 10, 128, -1, 0, 0}, {3035, 0.5714f, 303, 304, 300, 2, 37, -1, 0, 1}, {3036, 0.5714f, 305, 306, 200, 2, 40, -1, 0, 4}, {3037, 0.5714f, 307, 308, 1800, 0, 119, -1, 0, 0}, {3038, 0.5714f, 309, 310, 60, 11, 129, -1, 0, 0}, {3039, 0.5714f, 311, 312, 220, 2, 38, -1, 0, 2}, {3040, 0.5714f, 313, 314, 120, 0, 2, -1, 0, 0}, {3041, 0.5714f, 315, 316, 40, 9, 130, 10, 0, 0}, {3041, 0.5714f, 317, 318, 80, 9, 131, 28, 0, 0}, {3042, 0.5714f, 319, 320, 100, 16, 133, -1, 0, 0}, {3043, 0.5714f, 321, 322, 100, 16, 134, -1, 0, 0}, {3044, 0.5714f, 323, 324, 100, 16, 135, -1, 0, 0}, {3045, 0.5714f, 325, 326, 100, 16, 137, 147, 0, 0}, {3046, 0.5714f, 327, 328, 100, 16, 136, -1, 0, 0}, {3047, 0.5714f, 329, 330, 100, 17, 139, -1, 0, 0}, {3048, 0.5714f, 331, 332, 100, 17, 140, -1, 0, 0}, {3049, 0.5714f, 333, 334, 100, 17, 141, 14, 0, 0}, {3050, 0.5714f, 335, 336, 210, 17, 142, 14, 0, 0}, {3051, 0.5714f, 337, 338, 250, 2, 44, -1, 0, 8}, {3052, 0.5714f, 339, 340, 300, 2, 54, -1, 0, 18}, {3053, 0.5714f, 341, 342, 120, 2, 50, -1, 0, 14}, {3054, 0.5714f, 343, 344, 220, 2, 55, -1, 0, 19}, {3055, 0.5714f, 345, 346, 800, 2, 43, -1, 0, 7}, {3056, 0.5714f, 347, 348, 120, 8, 143, -1, 5, 0}, {3056, 0.5714f, 347, 348, 500, 8, 144, -1, 10, 0}, {3056, 0.5714f, 347, 348, 900, 8, 145, -1, 18, 0}, {3056, 0.5714f, 347, 349, 1400, 8, 146, -1, 25, 0}}+#define SHOP_ITEMS {{3033, 0.5714f, 305, 306, 150, 1, 125, -1, 0, 0}, {3033, 0.5714f, 305, 307, 500, 1, 126, 125, 0, 0}, {3034, 0.5714f, 308, 309, 550, 3, 127, -1, 0, 0}, {3035, 0.5714f, 310, 311, 950, 10, 128, -1, 0, 0}, {3036, 0.5714f, 312, 313, 300, 2, 37, -1, 0, 1}, {3037, 0.5714f, 314, 315, 200, 2, 40, -1, 0, 4}, {3038, 0.5714f, 316, 317, 1800, 0, 119, -1, 0, 0}, {3039, 0.5714f, 318, 319, 60, 11, 129, -1, 0, 0}, {3040, 0.5714f, 320, 321, 220, 2, 38, -1, 0, 2}, {3041, 0.5714f, 322, 323, 120, 0, 2, -1, 0, 0}, {3042, 0.5714f, 324, 325, 40, 9, 130, 10, 0, 0}, {3042, 0.5714f, 326, 327, 80, 9, 131, 28, 0, 0}, {3043, 0.5714f, 328, 329, 100, 16, 133, -1, 0, 0}, {3044, 0.5714f, 330, 331, 100, 16, 134, -1, 0, 0}, {3045, 0.5714f, 332, 333, 100, 16, 135, -1, 0, 0}, {3046, 0.5714f, 334, 335, 100, 16, 137, 147, 0, 0}, {3047, 0.5714f, 336, 337, 100, 16, 136, -1, 0, 0}, {3048, 0.5714f, 338, 339, 100, 17, 139, -1, 0, 0}, {3049, 0.5714f, 340, 341, 100, 17, 140, -1, 0, 0}, {3050, 0.5714f, 342, 343, 100, 17, 141, 14, 0, 0}, {3051, 0.5714f, 344, 345, 210, 17, 142, 14, 0, 0}, {3052, 0.5714f, 346, 347, 250, 2, 44, -1, 0, 8}, {3053, 0.5714f, 348, 349, 300, 2, 54, -1, 0, 18}, {3054, 0.5714f, 350, 351, 120, 2, 50, -1, 0, 14}, {3055, 0.5714f, 352, 353, 220, 2, 55, -1, 0, 19}, {3056, 0.5714f, 354, 355, 800, 2, 43, -1, 0, 7}, {3057, 0.5714f, 356, 357, 120, 8, 143, -1, 5, 0}, {3057, 0.5714f, 356, 357, 500, 8, 144, -1, 10, 0}, {3057, 0.5714f, 356, 357, 900, 8, 145, -1, 18, 0}, {3057, 0.5714f, 356, 358, 1400, 8, 146, -1, 25, 0}}#define SHOP_FIRST {0, 8, 21, 30}-#define SHOP_ROW_GEO {3031, 1.4551f, 0.0000f, 1.0000f, 1.0000f}+#define SHOP_ROW_GEO {3032, 1.4551f, 0.0000f, 1.0000f, 1.0000f}#define SHOP_ROW_COST {1.8423f, 0.2885f}#define SHOP_ACTIVE_RGB {255, 255, 255}#define SHOP_INACTIVE_RGB {141, 141, 141}#define SHOP_ROOMS {"Room_shop", "Room_mapper", "Room_Charm_Shop"}-#define SHOP_NOSTOCK {351, 352, 353}+#define SHOP_NOSTOCK {360, 361, 362}#define SHOP_TITLES {TITLE_SLY, TITLE_ISELDA, TITLE_CHARM_SLUG}#define SHOP_N 3#define COLLECT_FLEUR {0.0000f, 0.0000f, 0.0000f, 1.0000f}@@ -1173,33 +1183,33 @@#define COLLECT_MOVER_TO {-7.7000f, 6.0400f}#define STAG_AT {0.3000f, 0.3000f}#define STAG_K 1.2646f-#define STAG_BACKING {3057, -0.4427f, 0.0000f, 1.0000f, 0.6408f}+#define STAG_BACKING {3058, -0.4427f, 0.0000f, 1.0000f, 0.6408f}#define STAG_BACKING_A 0.9020f-#define STAG_PIECES {{3058, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {3059, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {3060, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3061, 0.4147f, 1.5909f, 1.0000f, 1.0000f}}+#define STAG_PIECES {{3059, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {3060, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {3061, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3062, 0.4147f, 1.5909f, 1.0000f, 1.0000f}}#define STAG_OPENED {-1, 155, 156}#define STAG_MARKS {{2.9379f, 3.7471f}, {4.8742f, 2.0690f}, {-0.4360f, 2.7790f}}#define STAG_SELECTOR {0.0000f, 0.0000f, 1.1797f, 1.2092f}-#define STAG_MAP_KNIGHT {3062, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define STAG_MAP_SHADOW {3063, 0.0110f, -0.0100f, 1.0000f, 0.9227f}+#define STAG_MAP_KNIGHT {3063, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define STAG_MAP_SHADOW {3064, 0.0110f, -0.0100f, 1.0000f, 0.9227f}#define STAG_T_ROW {-7.5992f, 4.9095f, 5.8145f}#define STAG_ROW_DY 1.0000f-#define STAG_POINTER_R {3064, 2.8680f, 0.6180f, -1.0000f, 1.0000f}-#define STAG_POINTER_L {3064, -2.8680f, 0.6180f, 1.0000f, 1.0000f}+#define STAG_POINTER_R {3065, 2.8680f, 0.6180f, -1.0000f, 1.0000f}+#define STAG_POINTER_L {3065, -2.8680f, 0.6180f, 1.0000f, 1.0000f}#define STAG_ROW {-7.5992f, 3.9576f}-#define STAG_LIST_KNIGHT {3062, -10.5102f, 4.6056f, 1.0000f, 1.0000f}-#define STAG_DIVIDER {3065, -7.6003f, 5.2734f, -1.0000f, -0.8696f}+#define STAG_LIST_KNIGHT {3063, -10.5102f, 4.6056f, 1.0000f, 1.0000f}+#define STAG_DIVIDER {3066, -7.6003f, 5.2734f, -1.0000f, -0.8696f}#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}-#define TXT_STAG_STATIONS 354-#define TXT_STAG_NAMES {355, 315, 317}+#define TXT_STAG_STATIONS 363+#define TXT_STAG_NAMES {364, 324, 326}#define STAG_NAMES_STR {124, 123, 127}#define STAG_BORDER_TOP {-0.0963f, 7.0185f, 0.9784f, 1.0028f, CLIP_STAGUI_STAG_BORDER_TOP_UP, CLIP_STAGUI_STAG_BORDER_TOP_DOWN, 0}#define STAG_BORDER_BOTTOM {-0.0638f, -6.5632f, 0.9165f, 0.9394f, CLIP_STAGUI_STAG_BORDER_BOTTOM_UP, CLIP_STAGUI_STAG_BORDER_BOTTOM_DOWN, 0}#define STAG_T_ACT_CONFIRM {11.1713f, -4.5306f, 15.3500f}#define STAG_KEY_CONFIRM {11.7464f, -4.7993f}-#define TXT_STAG_CTRL_TRAVEL 356+#define TXT_STAG_CTRL_TRAVEL 365#define STAG_T_ACT_CANCEL {11.1713f, -5.3525f, 15.3500f}#define STAG_KEY_CANCEL {11.7464f, -5.6213f}-#define TXT_STAG_CTRL_CANCEL 290+#define TXT_STAG_CTRL_CANCEL 299#define STAG_SCENES_STR {137, 136, 138}#define STAG_SCENES_ROOM {4, 19, 36}#define ROOM_ZONES {2, 4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 22, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6}diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.hindex 0744792b..9446e968 100644--- a/games/hollowknight/src/game.h+++ b/games/hollowknight/src/game.h@@ -365,7 +365,9 @@ void msg_draw(void);void blanker_set(float alpha, bool on);void white_blanker_fade(bool in); /* HUD Blanker White: FADE IN, FADE OUT (over its Fade Time) */void white_blanker_time(float t);-void white_blanker_reset(void);+void white_blanker_reset(void); /* (and the Prompt Blanker, the focus tutorial) */+void prompt_blanker(bool up); /* the HUD's Prompt Blanker: UP, DOWN */+void focus_prompt_fade(bool up); /* the focus tutorial (Focus_prompt_temp): its ColorFaders' Fade *//* the notices (Relic Get Msg, Charm Get Msg) and the charm tutorial (Charm Tutorial Msg) */void notice_icon(int k); /* (the next notice's icon: the scripts' NOTICE_ICONS) */void notice_show(int text); /* a relic's notice: its icon, its name */@@ -455,6 +457,8 @@ void dialogue_box_up(void);void dialogue_box_down(void);void dialogue_dream_box(bool up); /* Box Open Dream: BOX UP DREAM, BOX DOWN DREAM */void dialogue_centre(bool on); /* (SetTextMeshProAlignment: the text centred, or to the left) */+void dialogue_place(int which, float y); /* (SetPosition: the text's, the stop's, the arrow's (0, 1, 2), HUD units) */+void dialogue_stop_pause(float t); /* (Dialogue Page Control's Stop Pause) */void dialogue_start(int text);/* the yes or no box (Box Open YN, Text YN): its question, its toll (TakeGeo on YES), who hears YES or NO (a VM object) */void dialogue_box_up_yn(void);diff --git a/games/hollowknight/src/msg.c b/games/hollowknight/src/msg.cindex ffa15acb..ca4e94a5 100644--- a/games/hollowknight/src/msg.c+++ b/games/hollowknight/src/msg.c@@ -55,7 +55,30 @@ void white_blanker_fade(bool in) {wb.alpha = wb.from;}-void white_blanker_reset(void) { wb.on = false, wb.alpha = 0, wb.time = 1; }+/* the Prompt Blanker (its FSM: UP to black at 2/3 in 0.85 s, DOWN to none in 0.85 s, linearly) and the focus tutorial+ * (Focus_prompt_temp's ColorFaders: up after 3 s in 1 s, down in 0.15 s) */+typedef struct {+ float alpha, from, to, t, time, delay;+} Fade;+static Fade pb, fp;++static void fade_start(Fade *f, float to, float time, float delay) {+ f->from = f->alpha, f->to = to, f->t = 0, f->time = time, f->delay = delay;+}+static void fade_tick(Fade *f) {+ if (f->alpha == f->to) return;+ f->t += DT;+ float k = f->time > 0 ? (f->t - f->delay) / f->time : 1;+ if (k > 0) f->alpha = f->from + (f->to - f->from) * (k > 1 ? 1 : k);+}++void prompt_blanker(bool up) { fade_start(&pb, up ? 0.6667f : 0, 0.85f, 0); }+void focus_prompt_fade(bool up) { fade_start(&fp, up ? 1 : 0, up ? 1 : 0.15f, up ? 3 : 0); }++void white_blanker_reset(void) {+ wb.on = false, wb.alpha = 0, wb.time = 1;+ memset(&pb, 0, sizeof pb), memset(&fp, 0, sizeof fp);+}static void white_blanker_tick(void) {if (!wb.on) return;@@ -67,6 +90,7 @@ static void white_blanker_tick(void) {void msg_tick(void) {white_blanker_tick();+ fade_tick(&pb), fade_tick(&fp);notices_tick();if (m.st == MS_OFF) return;uint32_t pressed = g_hero.keys & ~m.prev_keys;@@ -249,11 +273,37 @@ static void notices_draw(void) {if (nt.t >= 5 && nt.t_down < 0) piece(&tute_stop, x + 0.05f, y - 9.19f, 1, 26);}+/* the key's box (the calculator's key, by name: as wide as the name), its left at x */+static void key_box(int text, float x, float y, float a, int slot) {+ float w = line(text, STYLE_PROMPT, 0, y, 0, false, 0) / HUD_PX + 0.5f, kx = x + w / 2;+ uint8_t al = (uint8_t)(a * 255 + 0.5f);+ if (!al) return;+ Inst in;+ sprite_inst(SPRITE_MSG_KEY, kx, y, 0, w / 0.95f, 1, gfx_dyn_tint(slot, 255, 255, 255, al), &in);+ gfx_hud(&in, 0);+ line(text, STYLE_PROMPT, kx, y, 0, false, a);+}++static void focus_prompt_draw(void) {+ static const struct { int16_t sprite; float x, y, kx, ky; } bg = FOCUS_PROMPT_BG;+ static const struct { int16_t text; float x, top; int8_t align; } rows[4] = FOCUS_PROMPT_TEXTS;+ static const struct { int16_t text; float x, y; } key = FOCUS_PROMPT_KEY;+ float a = fp.alpha;+ if (a <= 0) return;+ Inst in;+ sprite_inst(bg.sprite, bg.x, bg.y, 0, bg.kx, bg.ky, gfx_dyn_tint(29, 255, 255, 255, (uint8_t)(a * 255 + 0.5f)), &in);+ gfx_hud(&in, 0);+ for (int i = 0; i < 4; i++) line(rows[i].text, STYLE_MSG, rows[i].x, rows[i].top, rows[i].align, true, a);+ key_box(key.text, key.x, key.y, a, 30);+}+void msg_draw(void) {if (wb.on && wb.alpha > 0)gfx_hud_fill(-15, -9, 15, 9, gfx_dyn_tint(28, 255, 255, 255, (uint8_t)(wb.alpha * 255 + 0.5f)));- if (blank_on && blank_alpha > 0)- gfx_hud_fill(-15, -9, 15, 9, gfx_dyn_tint(27, 0, 0, 0, (uint8_t)(blank_alpha * 255 + 0.5f)));+ /* (the HUD Blanker and the Prompt Blanker: black, the one over the other) */+ float ba = 1 - (1 - (blank_on && blank_alpha > 0 ? blank_alpha : 0)) * (1 - pb.alpha);+ if (ba > 0) gfx_hud_fill(-15, -9, 15, 9, gfx_dyn_tint(27, 0, 0, 0, (uint8_t)(ba * 255 + 0.5f)));+ focus_prompt_draw(); /* (while the menus cannot be up: their tints') */notices_draw();if (m.st == MS_OFF) return;const int16_t *t = table[m.item];@@ -268,12 +318,5 @@ void msg_draw(void) {line(t[3], STYLE_MSG, 0, -4.64f + 1.0253f * 1.4407f / 2, 0, true, m.a[F_MSG1]);line(t[4], STYLE_MSG, 0, -6.15f + 1.7591f * 1.4407f / 2, 0, true, m.a[F_MSG2]);/* the key (the calculator's, by name: its key sprite as wide as the name) */- float w = line(t[5], STYLE_PROMPT, 0, -2.93f, 0, false, 0) / HUD_PX + 0.5f, kx = 0.53f - 0.475f + w / 2;- uint8_t al = (uint8_t)(m.a[F_BUTTON] * 255 + 0.5f);- if (al) {- Inst in;- sprite_inst(SPRITE_MSG_KEY, kx, -2.93f, 0, w / 0.95f, 1, gfx_dyn_tint(25, 255, 255, 255, al), &in);- gfx_hud(&in, 0);- line(t[5], STYLE_PROMPT, kx, -2.93f, 0, false, m.a[F_BUTTON]);- }+ key_box(t[5], 0.53f - 0.475f, -2.93f, m.a[F_BUTTON], 25);}diff --git a/games/hollowknight/src/text.c b/games/hollowknight/src/text.cindex efb7d57b..b4bdae8a 100644--- a/games/hollowknight/src/text.c+++ b/games/hollowknight/src/text.c@@ -84,6 +84,7 @@ float text_box(int text, int style, float x, float y, float w, int align, float#define MAX_PAGES 24#define KEYS_CONTINUE (K_JUMP | K_ATTACK | K_SPELL | K_FOCUS | K_DASH | K_OK | K_BACK | K_PAUSE | K_MAP | K_INV)+#define MARKER_Y 1.695f /* (the arrow's and the stop's, as Dialogue Page Control has them: the box's) */#define YN_BOX_Y 1.94f /* (Box Open YN: the box lower) */#define YN_TEXT_Y 1.89f /* (Text YN: its rect's center, its height; its lines centred) */#define YN_TEXT_H 3.9055f@@ -111,6 +112,10 @@ static struct {bool arrow_on, stop_on;bool finished; /* CONVO_FINISH, since dialogue_start */uint32_t prev_keys;+ /* (where a script put the text, the stop, the arrow (SetPosition, HUD units: a lore tablet's); its Stop Pause) */+ float place[3];+ bool placed;+ float stop_pause, pause_t;/* Box Open Dream: the dream box (up, or going down a while), the text centred (SetTextMeshProAlignment) */Anim dream;bool dream_on, centre;@@ -169,6 +174,23 @@ void dialogue_dream_box(bool up) {void dialogue_centre(bool on) { dl.centre = on; }+void dialogue_place(int which, float y) {+ if (which < 0 || which > 2) return;+ dl.place[which] = y;+ dl.placed = dl.place[0] != TEXT_Y || dl.place[1] != MARKER_Y || dl.place[2] != MARKER_Y;+}+void dialogue_stop_pause(float t) { dl.stop_pause = t; }++/* the text's rect's middle (HUD units): the box's, the text a third bigger about the box's place; where a script+ * put it, by as much */+static float text_mid(void) {+ float by = dl.yn ? YN_BOX_Y : BOX_Y;+ return dl.yn ? by + (dl.text_y - by) * TEXT_K : dl.text_y + (TEXT_Y - BOX_Y) * (TEXT_K - 1);+}++/* the arrow's and the stop's: as the box has them, about its place; where a script put them, there */+static float marker_y(float y) { return dl.placed ? y : dl.box_y + (y - dl.box_y) * TEXT_K; }+static int lines_per_page(const uint8_t *st) {float h = dl.text_h * HUD_PX * TEXT_K;return 1 + (int)((h - font_asc(st) - font_desc(st)) / font_line(st));@@ -208,7 +230,7 @@ static void show_page(int p) {void dialogue_start(int text) {/* StartConversation */- dl.yn = false, dl.text_y = TEXT_Y, dl.text_h = TEXT_H;+ dl.yn = false, dl.text_y = dl.place[0], dl.text_h = TEXT_H, dl.pause_t = 0;set_conversation(text_get(text));dl.finished = false;dl.pc = PC_IDLE;@@ -309,7 +331,9 @@ void dialogue_tick(void) {}break;case PC_STOP_PAUSE:- /* (Stop Pause: 0 s) then the stop marker up */+ /* (Stop Pause, then the stop marker up) */+ if ((dl.pause_t += DT) < dl.stop_pause) break;+ dl.pause_t = 0;dl.stop_on = true, dl.arrow_on = false;anim_play_from_frame(&dl.stop, CLIP_DIALOGUE_STOP_UP, 0);dl.pc = PC_CONV_END;@@ -358,6 +382,13 @@ void dialogue_tick(void) {}}+#define MARKER_K (1.3f * TEXT_K) /* (the arrow's and the stop's scale) */+static void marker(int sprite, float x, float y, uint8_t tint) {+ Inst in;+ sprite_inst(sprite, BOX_X + (x - BOX_X) * TEXT_K, marker_y(y), 0, MARKER_K, MARKER_K, tint, &in);+ gfx_hud(&in, 0);+}+static void box_sprite(int sprite, float x, float y, float sx, float sy, uint8_t tint) {/* (placed about the box's place at its scale and the text's; sized at its scale) */float k = dl.scale * TEXT_K;@@ -365,7 +396,6 @@ static void box_sprite(int sprite, float x, float y, float sx, float sy, uint8_tsprite_inst(sprite, BOX_X + (x - BOX_X) * k, dl.box_y + (y - dl.box_y) * k, 0, sx * dl.scale, sy * dl.scale, tint, &in);gfx_hud(&in, 0);}-#define MARKER_K (1.3f * TEXT_K) /* (the arrow's and the stop's scale) *//* Text YN's pieces: placed about the lower box's place at the text's scale */static float yn_x(float x) { return BOX_X + (x - BOX_X) * TEXT_K; }@@ -433,16 +463,15 @@ void dialogue_draw(void) {1.0745f * TEXT_K, white, &in);gfx_hud(&in, 0);}- if (dl.arrow_on && dl.arrow.sprite >= 0) box_sprite(dl.arrow.sprite, 0.0069f, 1.695f, MARKER_K, MARKER_K, white);- if (dl.stop_on && dl.stop.sprite >= 0) box_sprite(dl.stop.sprite, -0.0231f, 1.695f, MARKER_K, MARKER_K, white);+ if (dl.arrow_on && dl.arrow.sprite >= 0) marker(dl.arrow.sprite, 0.0069f, dl.place[2], white);+ if (dl.stop_on && dl.stop.sprite >= 0) marker(dl.stop.sprite, -0.0231f, dl.place[1], white);if (dl.yn) yn_draw(white);if (!dl.text) return;/* the page's lines, top left in the rect, as far as the typewriter shows */const uint8_t *st = font_style(STYLE_DIALOGUE);float w = TEXT_W * HUD_PX * TEXT_K, h = dl.text_h * HUD_PX * TEXT_K;float left = VIEW_W / 2 + TEXT_X * HUD_PX - w / 2;- float by = dl.yn ? YN_BOX_Y : BOX_Y;- float y = VIEW_H / 2 - (by + (dl.text_y - by) * TEXT_K) * HUD_PX - h / 2 + font_asc(st);+ float y = VIEW_H / 2 - text_mid() * HUD_PX - h / 2 + font_asc(st);int i = dl.page_start[dl.page], last = page_last(), per = lines_per_page(st);for (int l = 0; l < per && i < last; l++) {int next, e = line_end(st, dl.text, i, w, &next);@@ -461,6 +490,7 @@ void dialogue_reset(void) {dl.box_y = BOX_Y, dl.text_y = TEXT_Y, dl.text_h = TEXT_H;dl.coin.sprite = -1;dl.arrow.sprite = dl.stop.sprite = dl.dream.sprite = -1;+ dl.place[0] = TEXT_Y, dl.place[1] = dl.place[2] = MARKER_Y;}/* ---------------------------------------------------------------- prompt markers */diff --git a/games/hollowknight/src/vm.c b/games/hollowknight/src/vm.cindex ff60d0e3..ebf73346 100644--- a/games/hollowknight/src/vm.c+++ b/games/hollowknight/src/vm.c@@ -19,7 +19,8 @@#define NONE 0xFFFF#define OWNER 0xFF0Fenum { O_HERO = 0xFF00, O_HERO_LIGHT, O_DIALOGUE_MANAGER, O_DIALOGUE_TEXT, O_AREA_TITLE, O_CAMERA_PARENT, O_MAIN_CAMERA,- O_GAME_MANAGER, O_HUD_BLANKER, O_HORNET = 0xFF0C, O_WHITE_BLANKER, O_CHARM_TUTE, O_SHOP = 0xFF10 }; /* (0xFF0F: OWNER) */+ O_GAME_MANAGER, O_HUD_BLANKER, O_HORNET = 0xFF0C, O_WHITE_BLANKER, O_CHARM_TUTE, O_SHOP = 0xFF10, /* (0xFF0F: OWNER) */+ O_PROMPT_BLANKER, O_FOCUS_PROMPT };#define O_GATE 0xFD00 /* (+ k: a battle gate, obj.c's) */#define O_ENT 0xF000 /* (+ i: a room record (a camera lock area), the game's) */enum { OF_ACTIVE = 1, OF_RENDERER = 2, OF_ANIMATOR = 4, OF_TRIGGER = 8, OF_COLLIDER = 16,@@ -50,8 +51,9 @@ typedef struct {float x, y, sx, sy; /* its place and scale now */uint16_t flags;uint8_t alpha; /* (its material's color's alpha: the scripts') */- int8_t fade; /* (iTweenFadeTo: its alpha's change a step, to none or all) */+ int8_t fade; /* (iTweenFadeTo, ColorFader: its alpha's change a step, to fade_to, after wait steps) */int8_t anim; /* (its animation: one of vm.anims; -1 none) */+ uint8_t fade_to, wait;} Obj;typedef struct {int16_t obj; /* (-1: none) */@@ -95,6 +97,8 @@ static struct {int npersist;const uint8_t *folds; /* (sprites drawn with their objects: 36 bytes each) */int nfolds;+ const uint8_t *faders; /* (ColorFader: object, down and up alphas, down and up times, up delay (50ths): 6 bytes) */+ int nfaders;Fsm *executing; /* (the FSM whose action runs: its events to itself wait) */int depth;/* the area title's variables as scripts set them (title.c starts it from them) */@@ -501,6 +505,10 @@ static void obj_event(int o, int ev, uint16_t fsm_name) {if (ev == VMEV_FADE_IN || ev == VMEV_FADE_OUT) white_blanker_fade(ev == VMEV_FADE_IN);return;}+ if (o == O_PROMPT_BLANKER) {+ if (ev == VMEV_UP || ev == VMEV_DOWN) prompt_blanker(ev == VMEV_UP);+ return;+ }if (o == O_CHARM_TUTE) {if (ev == VMEV_CLOSE) charm_tute_close();return;@@ -538,6 +546,15 @@ static void game_event(int ev) {else if (ev == VMEV_NPC_CONVO_START) title_npc_convo_start();}+/* (an object's alpha to `to` in t seconds, after `wait` steps) */+static void fade_obj(int c, int to, float t, int wait) {+ Obj *o = &vm.objs[c];+ int d = to - o->alpha, step = t > DT ? (int)(d * DT / t) : d;+ if (step == 0) step = d > 0 ? 1 : d < 0 ? -1 : 0;+ o->fade = (int8_t)(step > 127 ? 127 : step < -127 ? -127 : step);+ o->fade_to = (uint8_t)to, o->wait = (uint8_t)wait;+}+static bool under(int o, int top) {for (int k = 0; k < MAX_VM_OBJS && obj_ok(o); k++, o = vm.rec[o].parent)if (o == top) return true;@@ -766,15 +783,42 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {float a = fval(f, rv(&r)), t = fval(f, rv(&r));bool kids = rb(&r);if (!obj_ok(o)) return true;- for (int c = 0; c < vm.nobjs; c++) {- if (c != o && !(kids && under(c, o))) continue;- int to = a >= 0.5f ? 255 : 0, d = to - vm.objs[c].alpha;- int step = t > DT ? (int)(d * DT / t) : d;- if (step == 0) step = d > 0 ? 1 : d < 0 ? -1 : 0;- vm.objs[c].fade = (int8_t)(step > 127 ? 127 : step < -127 ? -127 : step);+ for (int c = 0; c < vm.nobjs; c++)+ if (c == o || (kids && under(c, o))) fade_obj(c, a >= 0.5f ? 255 : 0, t, 0);+ return true;+ }+ case VMOP_FADECOLORFADER: {+ /* (ColorFader.Fade, its own and its children's that are on: up to its up color after its delay, or down) */+ int o = oval(f, rv(&r));+ bool up = rb(&r) == 0, kids = rb(&r);+ if (o == O_FOCUS_PROMPT) focus_prompt_fade(up);+ if (!obj_ok(o)) return true;+ for (int k = 0; k < vm.nfaders; k++) {+ const uint8_t *q = vm.faders + 6 * k;+ if (q[0] >= vm.nobjs || !obj_active(q[0]) || (q[0] != o && !(kids && under(q[0], o)))) continue;+ fade_obj(q[0], up ? q[2] : q[1], (up ? q[4] : q[3]) * DT, up ? q[5] : 0);}return true;}+ case VMOP_DIALOGUEPLACE: {+ int which = rb(&r);+ dialogue_place(which, fval(f, rv(&r)));+ return true;+ }+ case VMOP_STOPPAUSE:+ dialogue_stop_pause(fval(f, rv(&r)));+ return true;+ case VMOP_GETFSMBOOL: {+ /* (another FSM's bool: its object's FSM of that name) */+ int o = oval(f, rv(&r));+ uint16_t fname = (uint16_t)val(f, rv(&r));+ uint8_t slot = rb(&r), v = rb(&r);+ bool every = rb(&r);+ if (obj_ok(o) && slot != 255)+ for (int i = 0; i < vm.nfsms; i++)+ if (vm.fsms[i].owner == o && vm.fsms[i].name == fname) set_var(f, v, val(&vm.fsms[i], slot) != 0);+ return !every;+ }case VMOP_SETBENCHRESPAWN: {uint16_t m = rv(&r);int type = rb(&r);@@ -913,6 +957,7 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {return !every;}case VMOP_BOOLALLTRUE:+ case VMOP_BOOLNONETRUE:case VMOP_BOOLANYTRUE: {int n = rb(&r);bool all = true, any = false;@@ -923,7 +968,7 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {int ev = rb(&r);uint8_t v = rb(&r);bool every = rb(&r);- bool res = op == VMOP_BOOLALLTRUE ? (n > 0 && all) : any;+ bool res = op == VMOP_BOOLALLTRUE ? (n > 0 && all) : op == VMOP_BOOLNONETRUE ? !any : any;set_var(f, v, res);if (res) fsm_event(f, ev);return !every;@@ -1718,6 +1763,10 @@ void vm_enter(void) {set_var(&vm.fsms[p[0]], p[1], 1);}vm.nfolds = rd16(p), vm.folds = p + 2;+ p += 2 + 36 * vm.nfolds;+ vm.nfaders = rd16(p), vm.faders = p + 2;+ for (int k = 0; k < vm.nfaders; k++) /* (ColorFader's Setup: its down color) */+ if (vm.faders[6 * k] < nobjs) vm.objs[vm.faders[6 * k]].alpha = vm.faders[6 * k + 1];vm.prev_keys = g_hero.keys;/* (what it holds within the condition's: off too) */for (int i = 0; i < nobjs; i++)@@ -1752,10 +1801,11 @@ void vm_tick(void) {vm.dmg_dir = vm.dmg_type ? vm.spell_dir : vm.nail_dir;obj_event(i, VMEV_TAKE_DAMAGE, NONE);}- /* (iTweenFadeTo) */- if (o->fade) {+ /* (iTweenFadeTo, ColorFader) */+ if (o->wait) o->wait--;+ else if (o->fade) {int a = o->alpha + o->fade;- if (a <= 0 || a >= 255) a = a <= 0 ? 0 : 255, o->fade = 0;+ if (o->fade > 0 ? a >= o->fade_to : a <= o->fade_to) a = o->fade_to, o->fade = 0;o->alpha = (uint8_t)a;}Anim *an = oanim(i);diff --git a/games/hollowknight/tools/art.py b/games/hollowknight/tools/art.pyindex 3e58a805..df6caf89 100644--- a/games/hollowknight/tools/art.py+++ b/games/hollowknight/tools/art.py@@ -248,8 +248,10 @@ def encode_job(job):key = hashlib.sha1(_SRC_HASH.encode() + job.arr.tobytes() + repr(job.arr.shape).encode() +(job.pal.tobytes() if getattr(job, "pal", None) is not None else b"")).hexdigest()else:+ # (a sprite packed tight: where its pixels are in its rect too)+ tight = unity.sprite_by_key(job.key).tightkey = hashlib.sha1(repr((_SRC_HASH, job.key, job.scale, job.blur, job.alpha_only, job.all_cells, job.cells,- job.magnified)).encode()).hexdigest()+ job.magnified) + ((tight,) if tight else ())).encode()).hexdigest()path = os.path.join(unity.CACHE, "tex", key + ".pkl")if os.path.exists(path):with open(path, "rb") as f:diff --git a/games/hollowknight/tools/pack.py b/games/hollowknight/tools/pack.pyindex 8231f14f..aa38f111 100644--- a/games/hollowknight/tools/pack.py+++ b/games/hollowknight/tools/pack.py@@ -510,6 +510,39 @@ def main():for name, path in (("FLEUR", "Warning_Fleur0008"), ("BACKBOARD", "backboard"), ("IMAGE", "Image"), ("STOP", "Stop")):s, kx, ky = piece(ptute, by_tute["Charm Tutorial Msg/" + path])fleurs["TUTE_" + name] = "{%d, %.4ff, %.4ff}" % (s, kx, ky)+ # the focus tutorial King's Pass's first tablet shows (Focus_prompt_temp, the HUD's where it is): its picture, its+ # lines (Prompts: in the message's style) by their rects' tops, centred or ending at x, the key to hold (Cast's: its+ # box's left); a line no nearer the one above than its height (the text bigger)+ fdoc = unity.scene("Tutorial_01")+ fby = {o["path"]: o for o in fdoc["objects"]}+ froot = "_Props/Tut_tablet_top/Focus_prompt_temp"+ fo = fby[froot]+ s, kx, ky = piece(fdoc, fo, scale=[math.hypot(fo["m3"][0], fo["m3"][3]), math.hypot(fo["m3"][1], fo["m3"][4])])+ fleurs["FOCUS_PROMPT_BG"] = "{%d, %.4ff, %.4ff, %.4ff, %.4ff}" % (s, fo["pos"][0], fo["pos"][1], kx, ky)+ rows = []+ for n in ("Text1", "Text1B", "Text2", "Text3"):+ q = fby[froot + "/" + n]+ tc = next(c["v"] for c in q["c"] if c["type"] == "TextContainer" or c.get("class") == "TextContainer")+ tm = next(c["v"] for c in q["c"] if c.get("class") == "TextMeshPro")+ gt = next(c["v"] for c in q["c"] if c.get("class") == "SetTextMeshProGameText")+ k = math.hypot(q["m3"][0], q["m3"][3])+ w, h, mg = tc["m_rect"]["width"], tc["m_rect"]["height"], tc["m_margins"]+ x0 = q["pos"][0] + (-tc["m_pivot"]["x"] * w + mg["x"]) * k+ x1 = q["pos"][0] + ((1 - tc["m_pivot"]["x"]) * w - mg["z"]) * k+ top = q["pos"][1] + ((1 - tc["m_pivot"]["y"]) * h - mg["y"]) * k+ al = tm["m_textAlignment"] % 4+ assert al in (1, 2), n+ if rows:+ top = min(top, prev - text.STYLES["MSG"][2] / text.HUD_PX)+ prev = top+ rows.append("{%d, %.4ff, %.4ff, %d}" % (TEXTS.id(gt["sheetName"], gt["convName"], "MSG"),+ (x0 + x1) / 2 if al == 1 else x1, top, al - 1))+ fleurs["FOCUS_PROMPT_TEXTS"] = "{%s}" % ", ".join(rows)+ q = fby[froot + "/ActionButtonIcon"]+ sr = next(c["v"] for c in q["c"] if c["type"] == "SpriteRenderer")+ ks = unity.sprite(fdoc["level"], fdoc["externals"], *sr["m_Sprite"])+ fleurs["FOCUS_PROMPT_KEY"] = "{%d, %.4ff, %.4ff}" % (TEXTS.add("alpha", "PROMPT"), q["pos"][0] - ks.w / ks.ppu / 2 *+ math.hypot(q["m3"][0], q["m3"][3]), q["pos"][1])fleurs["NOTICE_ICONS"] = "{%s}" % ", ".join(str(SPRITES.id(dd, list(rr), 1.0, hud_res)) for dd, rr in vm.NOTICE_ICONS) \if vm.NOTICE_ICONS else "{-1}"pmenu = unity.scene("Menu_Title")diff --git a/games/hollowknight/tools/scene.py b/games/hollowknight/tools/scene.pyindex 484e62bf..86aae497 100644--- a/games/hollowknight/tools/scene.py+++ b/games/hollowknight/tools/scene.py@@ -193,6 +193,13 @@ def _instances(name):it.obj, it.sprite, it.mat = o, s, matit.pos, it.m3 = o["pos"], o["m3"]it.color = (col["r"], col["g"], col["b"], col["a"])+ cf = next((x.get("v") for x in o["c"] if x.get("class") == "ColorFader" and x.get("v")), None)+ if cf:+ # (a ColorFader's Start: its down color, until a script fades it up)+ dc = cf.get("downColour") or {}+ it.color = tuple(a * dc.get(k, 1) for a, k in zip(it.color, "rgba"))+ if it.color[3] <= 0:+ continueit.layer = layer_index(v["m_SortingLayerID"])it.order = v["m_SortingOrder"]it.flip = (v.get("m_FlipX", 0), v.get("m_FlipY", 0))diff --git a/games/hollowknight/tools/unity.py b/games/hollowknight/tools/unity.pyindex eae0e6bf..f3b067bc 100644--- a/games/hollowknight/tools/unity.py+++ b/games/hollowknight/tools/unity.py@@ -344,6 +344,9 @@ def sprite(level, exts, fid, pid):s.px, s.py = o.m_Pivot.x, o.m_Pivot.yb = o.m_Borders.border = (b.x, b.y, b.z, b.w)+ # (packed tight: its pixels only where it has some, a part of its rect, from this corner (its bottom left))+ tr, off = o.m_RD.textureRect, o.m_RD.textureRectOffset+ s.tight = (off.x, off.y) if abs(tr.width - s.w) > 0.5 or abs(tr.height - s.h) > 0.5 else Nones._obj = f.objects[pid]s.tex = None_sprites[key] = s@@ -359,9 +362,17 @@ def sprite_by_key(key):def sprite_image(s):+ """its image, as big as its rect (a sprite packed tight: its pixels where they are in it)"""if s.tex is None:with in_data():- s.tex = s._obj.read().image.convert("RGBA")+ im = s._obj.read().image.convert("RGBA")+ w, h = max(1, round(s.w)), max(1, round(s.h))+ if s.tight is not None and im.size != (w, h):+ from PIL import Image+ full = Image.new("RGBA", (w, h))+ full.paste(im, (round(s.tight[0]), round(h - s.tight[1] - im.height)))+ im = full+ s.tex = imreturn s.texdiff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.pyindex 7ec8e58c..d3156bfc 100644--- a/games/hollowknight/tools/vm.py+++ b/games/hollowknight/tools/vm.py@@ -29,7 +29,8 @@ ROOMS = {# items lying about (Shiny Item: a relic, a charm), the City Crest the False Knight leaves"Crossroads_01": ["Shiny Item", "Force Hard Landing"],"Tutorial_01": ["_Props/Chest/Item", "_Props/Collapser Tute 01", "_Scenery/Break Floor 1", "Interact Reminder",- "_Props/Tute Door 5/Active/Jump Reminder"], # (its chest: src/obj.c, which turns on what is in it)+ "_Props/Tute Door 5/Active/Jump Reminder", "_Props/Tut_tablet_top", "_Props/Tut_tablet_top (1)",+ "_Props/Tut_tablet_top (2)"], # (its chest: src/obj.c, which turns on what is in it)"Fungus1_22": ["Shiny Item", "Gate Switch", "Metal Gate", "Breakable Wall"],"Crossroads_10": ["Key Giver", "Breakable Wall"],# the shops: their keepers, their regions (the menu: src/shop.c)@@ -39,12 +40,12 @@ ROOMS = {# the grubs in their jars; the Grubfather, his rewards, the grubs back home"Crossroads_03": ["_Props/Grub Bottle", "_Props/Toll Gate", "_Props/Toll Gate 1", "_Props/Toll Gate Switch","Break Wall 2"],- "Fungus1_21": ["Grub Bottle"],+ "Fungus1_21": ["Grub Bottle", "Inspect Region"],"Crossroads_38": ["Grub King"] + ["Saved Grubs/Grub Saved %d" % n for n in range(1, 3)],# Hornet seen in Greenpath before her arena"Fungus1_02": ["Hornet Encounter GP1"],"Fungus1_03": ["Set Hornet Encounter"],- "Fungus1_17": ["Set Hornet Encounter"],+ "Fungus1_17": ["Set Hornet Encounter", "Inspect Region"],"Fungus1_31": ["Hornet Encounter Control", "_Props/Breakable Wall", "Toll Gate Machine", "Toll Gate Machine (1)","Toll Gate", "Toll Gate (1)"],# the world's other scripted things: walls that break, floors, a soul totem, tablets, a wall that turns on@@ -154,6 +155,8 @@ INT_STRINGS = range(0, GRUBS + 1)SPECIAL = {"Hero": 0xFF00, "HeroLight": 0xFF01, "DialogueManager": 0xFF02, "DialogueText": 0xFF03, "AreaTitle": 0xFF04,"CameraParent": 0xFF05, "MainCamera": 0xFF06, "GameManager": 0xFF07, "HUD Blanker": 0xFF08,"DialogueTextYN": 0xFF09, "UIManager": 0xFF0A, "Enemy Dream Msg": 0xFF0B, "HUD Blanker White": 0xFF0D}+# a scene's objects that are the HUD's (drawn by the C code: msg.c's focus prompt; src/vm.c: O_FOCUS_PROMPT), by name+HUD_CHILDREN = {"Focus_prompt_temp": 0xFF12}# objects scripts find by their tags: the Knight; a shop's menu (src/shop.c)TAGGED = {"Player": 0xFF00, "Shop Window": 0xFF10} # (src/vm.c: O_SHOP)O_NONE = 0xFFFF@@ -212,7 +215,7 @@ for e in ("FINISHED", "CONVO_FINISH", "CONVO START", "CONVO END", "BIG TITLE STA"HORNET LEAVE", "BG CLOSE", "BG QUICK CLOSE", "BG OPEN", "BG QUICK OPEN", "BG DESTROY", "WAKE", "BOX UP DREAM","BOX DOWN DREAM", "FADE IN", "FADE OUT", "FSM CANCEL", "CLOSE", "FK DEATH", "SHOP UP", "SHOP CLOSED","SHOP CLOSED QUICK", "SHOP WINDOW UP", "RESET SHOP WINDOW", "CLOSE SHOP WINDOW", "BOX UP YN", "BOX DOWN YN",- "YES", "NO", "CONTINUE", "RESET", "HIT", "UNCOVER"):+ "YES", "NO", "CONTINUE", "RESET", "HIT", "UNCOVER", "UP", "DOWN"):EVENTS.id(e)FIXED_EVENTS = len(EVENTS.list) # (src/data.h: VMEV_*)@@ -381,6 +384,12 @@ op("SoulOrbs", ("spawnMin", "i"), ("spawnMax", "i"), ("speedMin", "f"), ("speedM("angleMax", "f"), ("originVariationX", "f"), ("originVariationY", "f")) # (Soul Orb R: flung, then to the Knight)op("FadeTo", ("gameObject", "o"), ("alpha", "f"), ("time", "f"), ("includeChildren", "n")) # (iTweenFadeTo)op("SetBenchRespawn", ("marker", "x"), ("type", "n"), ("facing", "n")) # (PlayerData.SetBenchRespawn: the marker's name)+op("FadeColorFader", ("target", "o"), ("fadeType", "n"), ("useChildren", "n")) # (ColorFader.Fade: 0 up, 1 down)+op("BoolNoneTrue", ("boolVariables", "b*"), ("sendEvent", "e"), ("storeResult", "B"), ("everyFrame", "n"))+# (the dialogue text's place, its stop's, its arrow's (0, 1, 2: HUD units); the stop's pause before it shows)+op("DialoguePlace", ("which", "n"), ("y", "f"))+op("StopPause", ("time", "f"))+op("GetFsmBool", ("gameObject", "o"), ("fsmName", "s"), ("slot", "n"), ("storeValue", "B"), ("everyFrame", "n"))# HeroController's methods the scripts call (HeroCall's method)HERO_METHODS = ["RelinquishControl", "RegainControl", "StopAnimationControl", "StartAnimationControl", "FaceLeft",@@ -409,7 +418,7 @@ NOTICE_ICONS = []# the charms this part of the game has (their icons and names: msg.c, the inventory)CHARMS = [1, 2, 3, 4, 6, 7, 8, 14, 18, 19, 20]# the game's objects the scripts find by name that are not theirs (enemies): what they are to them-GAME_OBJECTS = {"Hornet Boss 1": 0xFF0C}+GAME_OBJECTS = {"Hornet Boss 1": 0xFF0C, "Prompt Blanker": 0xFF11} # (the HUD's Prompt Blanker: msg.c's)O_CHARM_TUTE = 0xFF0E # (src/vm.c)# what a trigger's Trigger2dEvent hears, by collideTag: the Knight (any), a spellTRIGGER_TAGS = {None: 0, "": 0, "Player": 0, "Untagged": 0, "Hero Spell": 1, "Nail Attack": 2}@@ -469,7 +478,7 @@ class Room:cls = {c.get("class") or c["type"] for c in o["c"]}if o["path"].startswith("Grub King/Rewards Parent/Reward ") and int(o["name"].split()[-1]) > GRUBS:return False- return not (cls & SKIP_CLASSES) and o["name"] not in SKIP_NAMES+ return not (cls & SKIP_CLASSES) and o["name"] not in SKIP_NAMES and o["name"] not in HUD_CHILDRENdef referenced(self):"""the names and objects the scene's scripts can find (FindChild, FindGameObject, references)"""@@ -747,6 +756,28 @@ class Compiler:self.consts.append(v)return self.nvars + self.consts.index(v)+ def found_nothing(self, v):+ """a gameObject variable only FindChild sets, from its owner, naming a child it does not have"""+ if not (isinstance(v, str) and v.startswith("$")):+ return False+ sets = [dict(a["params"]) for s in self.f["states"] for a in s["actions"]+ if v in [p[1] for p in a["params"] if p[0] in ("storeResult", "store", "storeGameObject", "storeObject")]]+ return bool(sets) and all(Q.get("gameObject") == "Owner" and "childName" in Q and not any(+ q.get("parent") == self.o["id"] and q["name"] == Q["childName"] for q in self.rm.by_id.values()) for Q in sets)++ def dialogue_part(self, v):+ """the dialogue text ($DialogueText), or its stop or arrow (FindChild of the parent GetParent gives): 0, 1, 2"""+ if v == "$DialogueText":+ return 0+ if not (isinstance(v, str) and v.startswith("$")):+ return None+ acts = [dict(a["params"]) for s in self.f["states"] for a in s["actions"] if a["name"] in ("FindChild", "GetParent")]+ parents = {Q.get("storeResult") for Q in acts if Q.get("gameObject") == "$DialogueText" and "childName" not in Q}+ for Q in acts:+ if Q.get("storeResult") == v and Q.get("gameObject") in parents and Q.get("childName") in ("Stop", "Arrow"):+ return 1 if Q["childName"] == "Stop" else 2+ return None+def static_child(self, v):"""a gameObject variable FindChild sets from its owner (always the same child) -> that child"""if not (isinstance(v, str) and v.startswith("$")):@@ -944,6 +975,24 @@ class Compiler:if n == "ReceivedDamage":# (a nail's hit on its collider)return self.emit("Trigger2dEvent", {"trigger": 0, "sendEvent": P.get("sendEvent"), "tag": TRIGGER_TAGS["Nail Attack"]})+ if n == "FindChild" and P.get("childName") in HUD_CHILDREN:+ return self.emit("SetGameObject", {"variable": P.get("storeResult"),+ "gameObject": ("objindex", HUD_CHILDREN[P.get("childName")])})+ if n == "GetFsmBool":+ go = P.get("gameObject")+ if self.found_nothing(go):+ return None # (a child it does not have: the variable as it was)+ return self.emit(n, dict(P, slot=self.fsm_slot(_one_string(self.rm, self.f, P.get("fsmName")),+ _one_string(self.rm, self.f, P.get("variableName")))))+ if n == "SetFsmGameObject" and P.get("gameObject") == "$DialogueText" and P.get("variableName") == "Requester":+ return None # (who hears CONVO_FINISH: all do here)+ if n == "SetFsmFloat" and P.get("gameObject") == "$DialogueText" and P.get("variableName") == "Stop Pause":+ return self.emit("StopPause", {"time": P.get("setValue")})+ if n == "SetPosition" and self.dialogue_part(P.get("gameObject")) is not None:+ if P.get("vector") is not None or P.get("x") is not None or P.get("y") is None or P.get("everyFrame"):+ self.problem("SetPosition %r" % P)+ return None+ return self.emit("DialoguePlace", {"which": self.dialogue_part(P.get("gameObject")), "y": P.get("y")})if n in ("GetFsmInt", "GetFsmFloat") and P.get("gameObject") == "$Damager":# (the hit's damages_enemy: its damage, its attack's type (0 the nail, 2 a spell), its direction)which = {"damageDealt": 0, "attackType": 1, "direction": 2}.get(P.get("variableName"))@@ -1689,6 +1738,15 @@ def room_blob(name, clip_index, sprites, owners=(), persist=None):rgba = [max(0, min(255, int(round(col[k] * 255)))) for k in "rgba"]folds += struct.pack("<BBhfffffHhBBBBHH", i, 0, spr, q["pos"][0] - o["pos"][0], q["pos"][1] - o["pos"][1], q["pos"][2],sx, sy, layer, order, *rgba, blend, 0)+ # (ColorFader: the objects that have one: its down and up colors' alphas, their times and the up's delay, in 50ths+ # of a second)+ faders = [(i, c["v"]) for i, o in enumerate(rm.objs) for c in o["c"] if c.get("class") == "ColorFader" and c.get("v")]+ assert len(faders) < 256 and all(i < 256 for i, _ in faders), name+ A = lambda col: max(0, min(255, int(round((col or {}).get("a", 1) * 255))))+ T = lambda t: max(0, min(255, int(round((t or 0) * 50))))+ folds += struct.pack("<H", len(faders)) + b"".join(+ struct.pack("<BBBBBB", i, A(v.get("downColour")), A(v.get("upColour")), T(v.get("downTime")), T(v.get("upTime")),+ T(v.get("upDelay"))) for i, v in faders)head = struct.pack("<HHHH", len(rm.objs), len(rm.fsms), nmap, len(rm.persist))return bytes(head + objs + clipmap + fsms + folds)