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.

Hollow Knight: grubs and the Grubfather

Mason Chen85c56f70c572
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.bin
index 79783bc5..0b960675 100644
Binary files a/games/hollowknight/src/data.bin and b/games/hollowknight/src/data.bin differ
diff --git a/games/hollowknight/src/data.h b/games/hollowknight/src/data.h
index 4dba4a8b..841e36a8 100644
--- a/games/hollowknight/src/data.h
+++ b/games/hollowknight/src/data.h
@@ -563,16 +563,27 @@
#define CLIP_VM9_TALK 503
#define CLIP_VM9_TALK_END 504
#define CLIP_VM9_TURN 505
-#define CLIP_ANIM0_DASH_CLOAK_CORPSE000 506
-#define CLIP_ANIM1_GROUND_PLINK_0 507
-#define CLIP_ANIM2_FIREBALL_COLLECT_ANIM 508
-#define SPRITE_HERO_LIGHT 2251
-#define SPRITE_DIALOGUE_BACKBOARD 2252
-#define SPRITE_PROMPT_SHADOW 2253
-#define SPRITE_CORPSE_NAIL 2254
-#define SPRITE_FK_BARREL 2255
-#define SPRITE_FK_STAFF 2256
-#define SPRITE_DIGIT0 2544
+#define CLIP_VM11_CRY 506
+#define CLIP_VM11_CRY_TURN 507
+#define CLIP_VM11_FREED 508
+#define CLIP_VM11_HOME_BOUNCE 509
+#define CLIP_VM11_HOME_WAVE 510
+#define CLIP_VM11_IDLE 511
+#define CLIP_VM12_BECKON 512
+#define CLIP_VM12_CHEER 513
+#define CLIP_VM12_CRY 514
+#define CLIP_VM12_GIFT 515
+#define CLIP_VM12_IDLE 516
+#define CLIP_ANIM0_DASH_CLOAK_CORPSE000 517
+#define CLIP_ANIM1_GROUND_PLINK_0 518
+#define CLIP_ANIM2_FIREBALL_COLLECT_ANIM 519
+#define SPRITE_HERO_LIGHT 2381
+#define SPRITE_DIALOGUE_BACKBOARD 2382
+#define SPRITE_PROMPT_SHADOW 2383
+#define SPRITE_CORPSE_NAIL 2384
+#define SPRITE_FK_BARREL 2385
+#define SPRITE_FK_STAFF 2386
+#define SPRITE_DIGIT0 2682
#define STYLE_DIALOGUE 0
#define STYLE_PROMPT 1
#define STYLE_TITLE_L 2
@@ -734,8 +745,12 @@
#define VMOP_FLINGOBJECT 97
#define VMOP_GETSPEED2D 98
#define VMOP_SENDRANDOMEVENT 99
-#define VMOP_INCREMENTPLAYERDATAINT 100
-#define VMOP_LISTENFORINVENTORY 101
+#define VMOP_INTTOSTRING 100
+#define VMOP_FLINGGEO 101
+#define VMOP_INCREMENTPLAYERDATAINT 102
+#define VMOP_LISTENFORINVENTORY 103
+#define VMOP_WAITRANDOM 104
+#define VMOP_FLINGPIECE 105
#define VMEV_FINISHED 0
#define VMEV_CONVO_FINISH 1
#define VMEV_CONVO_START 2
@@ -765,10 +780,10 @@
#define VMEV_CLOSE 26
#define VMEV_FK_DEATH 27
#define VMSTR_NPC_TITLE 14
-#define VMSTR_VISITED 258
-#define VMSTR_DISPLAY_RIGHT 259
+#define VMSTR_VISITED 298
+#define VMSTR_DISPLAY_RIGHT 299
#define VMSTR_HORNET_SAVER 104
-#define VMSTR_ITEM 226
+#define VMSTR_ITEM 256
#define STR_ATTACK_RANGE 23
#define STR_EVADE_RANGE 50
#define STR_SPIT_RANGE 51
@@ -797,63 +812,63 @@
#define TITLE_CHARM_SLUG 19
#define NUM_TITLES 20
#define TITLE_TABLE {{64, 65, -1, -1}, {66, 67, 68, -1}, {69, 70, -1, 71}, {72, 73, -1, 74}, {75, 76, -1, 77}, {78, 79, -1, -1}, {80, 81, 82, -1}, {83, 84, -1, -1}, {85, 86, -1, -1}, {87, 88, -1, -1}, {89, 90, -1, -1}, {91, 92, -1, -1}, {93, 94, -1, -1}, {95, 96, -1, -1}, {97, 98, -1, 99}, {100, 101, -1, 102}, {100, 101, -1, 103}, {104, 105, 106, -1}, {104, 105, -1, -1}, {107, 108, -1, 109}}
-#define SPRITE_FLEUR_TOP 2257
+#define SPRITE_FLEUR_TOP 2387
#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
#define FLEUR_FPS 15.0f
-#define SPRITE_FLEUR_BOT 2258
+#define SPRITE_FLEUR_BOT 2388
#define FLEUR_BOT_RECTS {{0.000f, 0.000f, 0.016f, 0.016f}, {0.000f, 0.000f, 0.016f, 0.016f}, {0.391f, 0.406f, 0.828f, 0.844f}, {-1.063f, 0.281f, 1.516f, 1.016f}, {-1.594f, -0.047f, 2.109f, 1.031f}, {-1.984f, -0.156f, 2.375f, 1.047f}, {-2.531f, -0.438f, 2.719f, 1.172f}, {-2.688f, -0.594f, 2.766f, 1.188f}, {-2.797f, -0.797f, 3.156f, 1.219f}, {-3.078f, -0.938f, 3.219f, 1.219f}, {-3.250f, -1.156f, 3.438f, 1.219f}, {-3.250f, -1.172f, 3.828f, 1.219f}, {-3.781f, -1.188f, 4.203f, 1.234f}, {-3.984f, -1.188f, 4.344f, 1.234f}, {-4.281f, -1.203f, 4.562f, 1.234f}, {-4.406f, -1.203f, 4.641f, 1.234f}, {-4.578f, -1.219f, 4.719f, 1.234f}, {-4.656f, -1.219f, 4.719f, 1.234f}, {-4.734f, -1.219f, 4.734f, 1.234f}, {-4.750f, -1.234f, 4.734f, 1.234f}, {-4.766f, -1.234f, 4.734f, 1.250f}, {-4.766f, -1.234f, 4.734f, 1.250f}}
-#define SPRITE_MSG_BG 2259
-#define SPRITE_MSG_STOP 2260
-#define SPRITE_MSG_FLEUR 2261
-#define SPRITE_MSG_KEY 2262
-#define SPRITE_MSG_ICON_FIREBALL 2263
-#define SPRITE_MSG_ICON_DASH 2264
-#define SPRITE_GRASS_BALL 2265
+#define SPRITE_MSG_BG 2389
+#define SPRITE_MSG_STOP 2390
+#define SPRITE_MSG_FLEUR 2391
+#define SPRITE_MSG_KEY 2392
+#define SPRITE_MSG_ICON_FIREBALL 2393
+#define SPRITE_MSG_ICON_DASH 2394
+#define SPRITE_GRASS_BALL 2395
#define MSG_TABLE {{110, 111, 112, 113, 114, 115}, {116, 117, 118, 119, 120, 121}}
-#define NOTICE_BACKBOARD {2266, 1.0000f, 0.6931f}
-#define TUTE_FLEUR {2261, 1.0000f, 1.0000f}
-#define TUTE_BACKBOARD {2267, 1.0000f, 0.9560f}
-#define TUTE_IMAGE {2268, 1.0000f, 1.0000f}
-#define TUTE_STOP {2260, 1.0000f, 1.0000f}
-#define NOTICE_ICONS {2269, 2270, 2271}
+#define NOTICE_BACKBOARD {2396, 1.0000f, 0.6931f}
+#define TUTE_FLEUR {2391, 1.0000f, 1.0000f}
+#define TUTE_BACKBOARD {2397, 1.0000f, 0.9560f}
+#define TUTE_IMAGE {2398, 1.0000f, 1.0000f}
+#define TUTE_STOP {2390, 1.0000f, 1.0000f}
+#define NOTICE_ICONS {2399, 2400, 2401}
#define CHARM_ICON_K 1.5000f
-#define CHARM_ICONS {-1, 2272, 2273, 2274, 2275, -1, 2276, 2277, 2278, -1, -1, -1, -1, -1, 2279, -1, -1, -1, 2280, 2281, 2282, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CHARM_ICONS {-1, 2402, 2403, 2404, 2405, -1, 2406, 2407, 2408, -1, -1, -1, -1, -1, 2409, -1, -1, -1, 2410, 2411, 2412, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
#define CHARM_NAMES {-1, 122, 123, 124, 125, -1, 126, 127, 128, -1, -1, -1, -1, -1, 129, -1, -1, -1, 130, 131, 132, -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 133
#define TXT_CHARM_TUTE_SUB 134
#define TXT_CHARM_REMINDER 135
-#define MENU_LOGO {2283, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_LOGO {2413, 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 {2284, 0.0000f, 0.0000f, 1.0023f, 1.0000f}
+#define MENU_POINTER {2414, 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 {2285, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
+#define MENU_PROFILES_FLEUR {2415, 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, {2286, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2287, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2288, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2289, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2290, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
+#define MENU_SLOT_ZONES {{2, {2416, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2417, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2418, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2419, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2420, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
#define MENU_SLOT_NZONES 5
#define MENU_SLOT_BG_DY 0.0102f
-#define MENU_SLOT_FLEUR {2291, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_FLEUR {2421, 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 {2292, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_SELECTOR {2422, 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 {2293, 0.0000f, 0.0000f, 1.0000f, 1.0025f}
+#define MENU_SLOT_CURSOR {2423, 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 {2294, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_ORB {2424, 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 {2295, 0.0000f, 0.0000f, 1.0039f, 1.0000f}
+#define MENU_SLOT_GEO {2425, 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 {2296, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_HEALTH {2426, 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
@@ -871,9 +886,9 @@
#define MENU_SLOT_YES_X 2.5813f
#define MENU_SLOT_NO_X 6.2296f
#define MENU_BACK_Y -5.5406f
-#define MENU_PAUSE_TOP {2297, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_TOP {2427, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_PAUSE_TOP_Y 2.3653f
-#define MENU_PAUSE_BOT {2298, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_BOT {2428, 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
@@ -892,39 +907,39 @@
#define TXT_ZONES {148, 149, 150, 151, 152}
#define INV_X -4.0500f
#define INV_Y 7.5500f
-#define INV_BORDER {{2299, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2299, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2300, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2301, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2302, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2303, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
+#define INV_BORDER {{2429, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2429, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2430, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2431, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2432, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2433, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
#define INV_NBORDER 6
-#define INV_FRAME {2304, 4.0479f, -7.1963f, 1.0f, 1.0f}
-#define INV_ARROW_L {2305, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
-#define INV_ARROW_R {2305, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_L {2306, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_R {2306, 18.0400f, -0.4300f, 1.0000f, 1.0000f}
+#define INV_FRAME {2434, 4.0479f, -7.1963f, 1.0f, 1.0f}
+#define INV_ARROW_L {2435, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
+#define INV_ARROW_R {2435, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_L {2436, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_R {2436, 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 {155, 156, 157, 158}
-#define CH_BB {2307, -7.9200f, -8.3700f, 1.0000f, 1.0000f}
+#define CH_BB {2437, -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 {2308, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
+#define CH_GLOW {2438, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
#define CH_GLOW_A 0.6970f
-#define CH_ICONS {-1, 2272, 2273, 2274, 2275, -1, 2276, 2277, 2278, -1, -1, -1, -1, -1, 2279, -1, -1, -1, 2280, 2281, 2282, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define CH_NEXT_DOT {2309, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_ICONS {-1, 2402, 2403, 2404, 2405, -1, 2406, 2407, 2408, -1, -1, -1, -1, -1, 2409, -1, -1, -1, 2410, 2411, 2412, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CH_NEXT_DOT {2439, 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 {2310, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
-#define CH_NOTCH_EMPTY {2311, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_FULL {2440, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_EMPTY {2441, 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 {2312, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
+#define CH_DIVIDER {2442, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}
-#define CH_COST_PIP {2310, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_COST_PIP {2440, 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
@@ -933,9 +948,9 @@
#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 {2313, 16.3208f, -13.2878f, 1.0f, 1.0f}
+#define CH_CONFIRM_KEY {2443, 16.3208f, -13.2878f, 1.0f, 1.0f}
#define CH_CONFIRM_KEY_W 0.6412f
-#define CH_CURSOR {2314, 0.0000f, 0.0000f, 1.0000f, 0.9756f}
+#define CH_CURSOR {2444, 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 159
@@ -949,23 +964,23 @@
#define TXT_CHARM_NAMES_INV {-1, 167, 168, 169, 170, -1, 171, 172, 173, -1, -1, -1, -1, -1, 174, -1, -1, -1, 175, 176, 177, -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, 178, 179, 180, 181, -1, 182, 183, 184, -1, -1, -1, -1, -1, 185, -1, -1, -1, 186, 187, 188, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
#define TXT_KEY_OK 189
-#define INV_FIXED {{2315, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2316, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2317, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2318, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2319, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2320, -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}, {2321, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2322, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}
+#define INV_FIXED {{2445, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2446, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2447, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2448, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2449, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2450, -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}, {2451, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2452, -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 {{2323, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2324, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2325, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2326, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
-#define INV_VESSEL_PIECES {{2327, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2328, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2329, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}
+#define INV_HEART_PIECES {{2453, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2454, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2455, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2456, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
+#define INV_VESSEL_PIECES {{2457, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2458, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2459, -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 {{2330, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2331, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2332, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2333, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2334, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2335, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}
+#define INV_EQ {{2460, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2461, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2462, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2463, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2464, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2465, 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 {{2336, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2337, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2338, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2339, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}
+#define INV_TRINKETS {{2466, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2467, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2468, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2469, 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 {2340, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
-#define INV_DIVIDERS {{2341, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2341, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}
+#define INV_TRINKET_BB {2470, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
+#define INV_DIVIDERS {{2471, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2471, 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 {{190, 191}, {192, 193}, {194, 195}, {192, 196}, {192, 197}, {198, 199}}
diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.h
index ceceb750..b5c2021d 100644
--- a/games/hollowknight/src/game.h
+++ b/games/hollowknight/src/game.h
@@ -61,9 +61,10 @@ typedef struct {
uint8_t rancid_eggs, ore;
uint8_t charm_slots_filled; /* (charmSlotsFilled: the notches the equipped charms take) */
uint8_t heart_pieces, vessel_fragments, simple_keys;
+ uint8_t grubs_collected, grub_rewards; /* (grubsCollected, grubRewards: the Grubfather's given) */
uint8_t equipped[12]; /* (equippedCharms: in the order they were equipped; 0 ends it) */
uint8_t current_inv_pane; /* (currentInvPane) */
- uint8_t reserved[34];
+ uint8_t reserved[32];
/* (saved apart, by the objects' names: their states) */
uint8_t persist[MAX_PERSIST / 8];
/* (not saved) */
@@ -326,6 +327,9 @@ void vm_tick(void);
void vm_draw(void);
void vm_broadcast(int ev);
void vm_spell(float x0, float y0, float x1, float y1); /* (a spell's box: the triggers it is in) */
+void vm_nail(const float *pts, int npts); /* (the nail's slash: the triggers it meets) */
+void piece_spawn(int sprite, int layer, int order, int flags, float x, float y, float z, float rot, float gravity,
+ float bounce, float spin_factor, float mirror, float vx, float vy, bool resting); /* (obj.c: debris) */
void vm_activate_children(uint16_t name, bool on); /* ActivateAllChildren of a script object, by name */
/* the message as an item is taken (msg.c: MSG_*), the HUD Blanker (a white screen the scripts fade) */
void msg_show(int item);
diff --git a/games/hollowknight/src/obj.c b/games/hollowknight/src/obj.c
index d3debc8d..4e778dec 100644
--- a/games/hollowknight/src/obj.c
+++ b/games/hollowknight/src/obj.c
@@ -50,22 +50,30 @@ typedef struct {
} Piece;
static Piece pieces[MAX_PIECES];
-static void piece_fling(const Ent *p, float ox, float oy, float angle_offset, float amin, float amax, float smin, float smax,
- float mult) {
+/* a piece: its sprite, place, how it falls (gravity), bounces (ObjectBounce, -1 none) and spins (flags: 1 a push of
+ * torque, 2 turned at random first); resting: where it is, still */
+void piece_spawn(int sprite, int layer, int order, int flags, float x, float y, float z, float rot, float gravity,
+ float bounce, float spin_factor, float mirror, float vx, float vy, bool resting) {
Piece *q = NULL;
for (int i = 0; i < MAX_PIECES && !q; i++)
if (!pieces[i].on) q = &pieces[i];
if (!q) return; /* (all in use: this one is not seen) */
- q->on = true, q->resting = false, q->steps = 0;
- q->sprite = (int16_t)p->s0, q->layer = p->group, q->order = p->a;
- q->x = ox + p->x0, q->y = oy + p->y0, q->z = p->y1;
- q->spin = p->flags & 1;
+ q->on = true, q->resting = resting, q->steps = 0;
+ q->sprite = (int16_t)sprite, q->layer = (uint8_t)layer, q->order = (uint16_t)order;
+ q->x = x, q->y = y, q->z = z;
+ q->spin = flags & 1;
+ q->ang = flags & 2 ? rand_range(0, 360) : rot;
+ q->gravity = gravity, q->bounce = bounce, q->spin_factor = spin_factor, q->mirror = mirror;
+ q->vx = vx, q->vy = vy;
+ q->w = 0, q->speed = sqrtf(vx * vx + vy * vy);
+}
+
+static void piece_fling(const Ent *p, float ox, float oy, float angle_offset, float amin, float amax, float smin, float smax,
+ float mult) {
/* (Break turns it by the angle offset; SpinSelf.Start, after, at random) */
- q->ang = q->spin ? rand_range(0, 360) : p->x1 + angle_offset;
- q->gravity = p->p0, q->bounce = p->p1, q->spin_factor = p->p2, q->mirror = p->p3;
float a = rand_range(amin, amax) * (float)M_PI / 180, s = rand_range(smin, smax) * mult;
- q->vx = cosf(a) * s, q->vy = sinf(a) * s;
- q->w = 0, q->speed = s;
+ piece_spawn(p->s0, p->group, p->a, p->flags & 1 ? 3 : 0, ox + p->x0, oy + p->y0, p->y1, p->x1 + angle_offset, p->p0,
+ p->p1, p->p2, p->p3, cosf(a) * s, sinf(a) * s, false);
}
static void pieces_tick(void) {
@@ -848,6 +856,7 @@ void obj_swing_start(void) {
int obj_nail(const float *pts, int npts, float direction) {
/* (damages_enemy: the nail's damage, at its Multiplier; Fury's 1.75) */
int out = enemies_nail(pts, npts, direction, g_hero.fury ? (int)rintf(g_pd.nail_damage * 1.75f) : g_pd.nail_damage);
+ vm_nail(pts, npts);
for (int k = 0; k < nobjs; k++) {
Obj *o = &objs[k];
const Ent *e = ent_at(o->ent);
diff --git a/games/hollowknight/src/vm.c b/games/hollowknight/src/vm.c
index 6e0f4534..d1e15f65 100644
--- a/games/hollowknight/src/vm.c
+++ b/games/hollowknight/src/vm.c
@@ -24,7 +24,8 @@ enum { O_HERO = 0xFF00, O_HERO_LIGHT, O_DIALOGUE_MANAGER, O_DIALOGUE_TEXT, O_ARE
enum { OF_ACTIVE = 1, OF_RENDERER = 2, OF_ANIMATOR = 4, OF_TRIGGER = 8, OF_COLLIDER = 16,
OF_GONE = 32, OF_INSIDE = 64, OF_WAS_INSIDE = 128,
OF_COND_OFF = 256, /* (not there: its condition) */
- OF_SPELL_HIT = 512, OF_SPELL_IN = 1024, OF_SPELL_WAS = 2048 }; /* (a spell in its trigger) */
+ OF_SPELL_HIT = 512, OF_SPELL_IN = 1024, OF_SPELL_WAS = 2048, /* (a spell in its trigger) */
+ OF_NAIL_HIT = 4096, OF_NAIL_IN = 8192, OF_NAIL_WAS = 16384 }; /* (the nail's slash on its collider) */
#define OF_ANIM_OFF 32 /* (its record's: off once its clip is over, DeactivateAfter2dtkAnimation) */
#define OF_WAVE 64 /* (its record's: WaveEffectControl, grows and fades as it is on: bx its speed, by its scale) */
#define OF_FADE 128 /* (its record's: SimpleSpriteFade, fades as it is on, then off: bx its time, by the alpha to) */
@@ -216,6 +217,8 @@ static int pd_int(int i) {
case 14: case 15: case 16: case 17: return g_pd.trinkets[i - 14];
case 18: return g_pd.rancid_eggs;
case 19: return g_pd.ore;
+ case 20: return g_pd.grubs_collected;
+ case 21: return g_pd.grub_rewards;
default: return 0;
}
}
@@ -233,6 +236,8 @@ static void pd_set_int(int i, int v) {
case 14: case 15: case 16: case 17: g_pd.trinkets[i - 14] = (uint8_t)v; break;
case 18: g_pd.rancid_eggs = (uint8_t)v; break;
case 19: g_pd.ore = (uint8_t)v; break;
+ case 20: g_pd.grubs_collected = (uint8_t)v; break;
+ case 21: g_pd.grub_rewards = (uint8_t)v; break;
}
}
@@ -487,6 +492,46 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
}
return false;
}
+ case VMOP_WAITRANDOM: {
+ /* (a time between the two, the same all through this visit of its state) */
+ float lo = fval(f, rv(&r)), hi = fval(f, rv(&r));
+ int ev = rb(&r);
+ uint32_t h = (uint32_t)(f - vm.fsms) * 2654435761u ^ (uint32_t)f->epoch * 40503u;
+ h ^= h >> 15, h *= 0x2c1b3c6du, h ^= h >> 12;
+ float t = lo + (hi - lo) * (float)(h & 0xffff) / 65535.0f;
+ if (f->t >= t && mode == M_UPDATE) {
+ fsm_event(f, ev);
+ return true;
+ }
+ return false;
+ }
+ case VMOP_FLINGPIECE: {
+ int o = oval(f, rv(&r));
+ bool hide = rb(&r), snap = rb(&r);
+ uint16_t sprite = rv(&r);
+ uint8_t layer = rb(&r);
+ uint16_t order = rv(&r);
+ uint8_t pfl = rb(&r);
+ float k[8];
+ for (int i = 0; i < 8; i++) k[i] = rdf(r.p), r.p += 4; /* dx dy z rot gravity bounce spin mirror */
+ uint16_t s0 = rv(&r), s1 = rv(&r), a0 = rv(&r), a1 = rv(&r);
+ float x, y;
+ if (!obj_ok(o) && o != O_HERO) return true;
+ obj_pos(o, &x, &y);
+ if (snap) {
+ /* (SnapToGround: on what is below, within 10) */
+ PhysHit hit;
+ if (phys_ray(x + k[0], y, 0, -1, 10, CF_TERRAIN, &hit)) y = hit.y + k[1];
+ else y += k[1];
+ piece_spawn(sprite, layer, order, pfl, x + k[0], y, k[2], k[3], k[4], k[5], k[6], k[7], 0, 0, true);
+ } else {
+ float s = rand_range(fval(f, s0), fval(f, s1)), a = rand_range(fval(f, a0), fval(f, a1)) * (float)M_PI / 180;
+ piece_spawn(sprite, layer, order, pfl, x + k[0], y + k[1], k[2], k[3], k[4], k[5], k[6], k[7], s * cosf(a),
+ s * sinf(a), false);
+ }
+ if (hide) obj_set_active(o, false);
+ return true;
+ }
case VMOP_NEXTFRAMEEVENT:
if (enter) return false;
if (mode != M_UPDATE) return false;
@@ -704,8 +749,35 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
return !every;
}
case VMOP_SENDRANDOMEVENT: {
+ /* (by their weights: shares of 255; none, alike) */
int n = rb(&r);
- if (n) fsm_event(f, r.p[(int)rand_range(0, (float)n - 0.001f)]);
+ const uint8_t *ev = r.p;
+ r.p += n;
+ int nw = rb(&r), i = 0;
+ if (!n) return true;
+ if (nw == n) {
+ float x = rand_range(0, 255), sum = 0;
+ for (i = 0; i < n - 1; i++)
+ if (x < (sum += r.p[i])) break;
+ } else
+ i = (int)rand_range(0, (float)n - 0.001f);
+ fsm_event(f, ev[i]);
+ return true;
+ }
+ case VMOP_INTTOSTRING: {
+ int v = ival(f, rv(&r));
+ uint8_t store = rb(&r);
+ int n = rb(&r);
+ set_var(f, store, v >= 0 && v < n ? rd16(r.p + 2 * v) : 0);
+ return true;
+ }
+ case VMOP_FLINGGEO: {
+ int type = rb(&r), n = rb(&r), o = oval(f, rv(&r));
+ float smin = fval(f, rv(&r)), smax = fval(f, rv(&r)), amin = fval(f, rv(&r)), amax = fval(f, rv(&r));
+ float x, y;
+ if (!obj_ok(o)) return true;
+ obj_pos(o, &x, &y);
+ geo_fling_at(type, n, x, y, smin, smax, amin, amax, 0);
return true;
}
case VMOP_ACTIVATEGAMEOBJECT: {
@@ -894,11 +966,12 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
return !every;
}
case VMOP_TRIGGER2DEVENT: {
- /* (the Knight, or a spell, against its owner's trigger: 0 entering, 1 in it, 2 leaving) */
+ /* (the Knight, a spell or the nail against its owner's trigger: 0 entering, 1 in it, 2 leaving) */
int kind = rb(&r), ev = rb(&r), tag = rb(&r);
if (mode != M_FIXED || !obj_ok(f->owner) || !(vm.objs[f->owner].flags & OF_COLLIDER)) return false;
uint16_t fl = vm.objs[f->owner].flags;
- bool in = fl & (tag ? OF_SPELL_IN : OF_INSIDE), was = fl & (tag ? OF_SPELL_WAS : OF_WAS_INSIDE);
+ bool in = fl & (tag == 2 ? OF_NAIL_IN : tag ? OF_SPELL_IN : OF_INSIDE);
+ bool was = fl & (tag == 2 ? OF_NAIL_WAS : tag ? OF_SPELL_WAS : OF_WAS_INSIDE);
if ((kind == 0 && in && !was) || (kind == 1 && in) || (kind == 2 && !in && was)) fsm_event(f, ev);
return false;
}
@@ -1215,6 +1288,16 @@ void vm_activate_children(uint16_t name, bool on) {
if (vm.rec[c].parent == o) obj_set_active(c, on);
}
+/* (the nail's slash this step: the triggers it meets) */
+void vm_nail(const float *pts, int npts) {
+ for (int i = 0; i < vm.nobjs; i++) {
+ const ObjRec *r = &vm.rec[i];
+ float cx = vm.objs[i].x + r->bx, cy = vm.objs[i].y + r->by;
+ if ((r->flags & OF_TRIGGER) && box_meets_shape(cx - r->bhx, cy - r->bhy, cx + r->bhx, cy + r->bhy, pts, npts))
+ vm.objs[i].flags |= OF_NAIL_HIT;
+ }
+}
+
/* (a spell's box: the triggers it is in, this step) */
void vm_spell(float x0, float y0, float x1, float y1) {
for (int i = 0; i < vm.nobjs; i++) {
@@ -1346,12 +1429,13 @@ void vm_tick(void) {
/* the Knight in the objects' triggers */
for (int i = 0; i < vm.nobjs; i++) {
Obj *o = &vm.objs[i];
- o->flags = (uint16_t)((o->flags & ~(OF_WAS_INSIDE | OF_SPELL_WAS)) | ((o->flags & OF_INSIDE) ? OF_WAS_INSIDE : 0) |
- ((o->flags & OF_SPELL_IN) ? OF_SPELL_WAS : 0));
+ o->flags = (uint16_t)((o->flags & ~(OF_WAS_INSIDE | OF_SPELL_WAS | OF_NAIL_WAS)) | ((o->flags & OF_INSIDE) ? OF_WAS_INSIDE : 0) |
+ ((o->flags & OF_SPELL_IN) ? OF_SPELL_WAS : 0) | ((o->flags & OF_NAIL_IN) ? OF_NAIL_WAS : 0));
bool on = (vm.rec[i].flags & OF_TRIGGER) && (o->flags & OF_COLLIDER) && obj_active(i);
- bool in = on && hero_box_in(i), spell = on && (o->flags & OF_SPELL_HIT);
- o->flags = (uint16_t)((in ? o->flags | OF_INSIDE : o->flags & ~OF_INSIDE) & ~OF_SPELL_HIT);
+ bool in = on && hero_box_in(i), spell = on && (o->flags & OF_SPELL_HIT), nail = on && (o->flags & OF_NAIL_HIT);
+ o->flags = (uint16_t)((in ? o->flags | OF_INSIDE : o->flags & ~OF_INSIDE) & ~(OF_SPELL_HIT | OF_NAIL_HIT));
o->flags = (uint16_t)(spell ? o->flags | OF_SPELL_IN : o->flags & ~OF_SPELL_IN);
+ o->flags = (uint16_t)(nail ? o->flags | OF_NAIL_IN : o->flags & ~OF_NAIL_IN);
if (vm.rec[i].flags & OF_WAVE) {
/* (WaveEffectControl: its speed down by a twentieth a step, to a half at least; its timer at that speed; past 1,
* off) */
diff --git a/games/hollowknight/tests/play.c b/games/hollowknight/tests/play.c
index 5f75b95a..6a8f29ee 100644
--- a/games/hollowknight/tests/play.c
+++ b/games/hollowknight/tests/play.c
@@ -56,6 +56,7 @@ int main(int argc, char **argv) {
g_pd.can_dash = true;
if (getenv("HKMP")) g_pd.mp = (int16_t)atoi(getenv("HKMP"));
if (getenv("HKHEALTH")) g_pd.health = (int8_t)atoi(getenv("HKHEALTH"));
+ if (getenv("HKGRUBS")) g_pd.grubs_collected = (uint8_t)atoi(getenv("HKGRUBS"));
if (getenv("HKGEO")) g_pd.geo = atoi(getenv("HKGEO"));
if (getenv("HKFIRE")) g_pd.fireball_level = atoi(getenv("HKFIRE"));
if (getenv("HKHORNETGP")) g_pd.hornet_greenpath = (uint8_t)atoi(getenv("HKHORNETGP"));
@@ -178,9 +179,9 @@ int main(int argc, char **argv) {
if (pd_flag(i)) printf(" %d", i);
int np = 0;
for (int i = 0; i < MAX_PERSIST; i++) np += persist_get(i);
- printf(" hornet_greenpath %d trinkets %d %d %d %d charms %d saved %d health %d+%d mp %d geo %d\n", g_pd.hornet_greenpath,
+ printf(" hornet_greenpath %d trinkets %d %d %d %d charms %d saved %d health %d+%d mp %d geo %d grubs %d\n", g_pd.hornet_greenpath,
g_pd.trinkets[0], g_pd.trinkets[1], g_pd.trinkets[2], g_pd.trinkets[3], g_pd.charms_owned, np, g_pd.health,
- g_pd.health_blue, g_pd.mp, (int)g_pd.geo);
+ g_pd.health_blue, g_pd.mp, (int)g_pd.geo, g_pd.grubs_collected);
}
return 0;
}
diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.py
index 9a1e858d..d958e6a2 100644
--- a/games/hollowknight/tools/vm.py
+++ b/games/hollowknight/tools/vm.py
@@ -23,12 +23,75 @@ ROOMS = {
"Tutorial_01": ["_Props/Chest/Item"], # (its chest: src/obj.c, which turns on what is in it)
"Fungus1_22": ["Shiny Item"],
"Crossroads_10": ["Key Giver"],
+ # the grubs in their jars; the Grubfather, his rewards, the grubs back home
+ "Crossroads_03": ["_Props/Grub Bottle"],
+ "Fungus1_21": ["Grub Bottle"],
+ "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_31": ["Hornet Encounter Control"],
}
+def _piece(doc, q, rigid=True):
+ """A piece of debris (a sprite with a Rigidbody2D: how it falls, bounces and spins) -> FlingPiece's operands."""
+ import scene
+ sr = next((c["v"] for c in q["c"] if c["type"] == "SpriteRenderer" and (c.get("v") or {}).get("m_Sprite")), None)
+ rb = next((c.get("v") or {} for c in q["c"] if c["type"] == "Rigidbody2D"), None)
+ if sr is None or (rigid and rb is None):
+ return None
+ m = np.array(q["m3"]).reshape(3, 3)
+ sx, sy = float(np.hypot(m[0, 0], m[1, 0])), float(np.hypot(m[0, 1], m[1, 1]))
+ mirror = -1.0 if np.linalg.det(m[:2, :2]) < 0 else 1.0
+ rot = float(np.degrees(np.arctan2(m[1, 0], m[0, 0]))) if mirror > 0 else float(np.degrees(np.arctan2(-m[1, 0], -m[0, 0])))
+ ob = next((c.get("v") or {} for c in q["c"] if c.get("class") == "ObjectBounce"), None)
+ sp = next((c.get("v") or {} for c in q["c"] if c.get("class") == "SpinSelf"), None)
+ ss = next((c.get("v") or {} for c in q["c"] if c.get("class") == "SpinSelfSimple"), None)
+ # (SpinSelf: a push of its speed times its factor, turned at random first; SpinSelfSimple: against its speed)
+ spin, flags = (sp.get("spinFactor", -7.5), 3) if sp is not None else (-ss.get("spinFactor", 0), 1 | (2 if ss.get("randomStartRotation") else 0)) if ss is not None else (0, 0)
+ return {"sprite": PIECE_SPRITES(doc, sr["m_Sprite"], max(sx, sy)), "layer": scene.layer_index(sr.get("m_SortingLayerID", 0)),
+ "order": (sr.get("m_SortingOrder", 0) + 32768) & 0xFFFF, "flags": flags, "z": q["pos"][2], "rot": rot,
+ "gravity": (rb or {}).get("m_GravityScale", 1), "bounce": ob.get("bounceFactor", 0) if ob else -1,
+ "spin": spin, "mirror": mirror}
+PIECE_SPRITES = None # (prepare: the sprites' id maker)
+
+
+def _fsm(name, start, vars_, states):
+ """an FSM written here: states as (name, [(action, {params})], {event: state})"""
+ act = lambda a, p: {"name": a, "enabled": True, "params": list(p.items())}
+ evs = sorted({e for _, _, t in states for e in t})
+ return {"name": name, "start": start, "vars": vars_, "global": [], "events": evs,
+ "states": [{"name": n, "actions": [act(a, p) for a, p in acts], "transitions": [[e, t] for e, t in tr.items()]}
+ for n, acts, tr in states]}
+
+
+def _behaviours(rm, o):
+ """The game's own components that are scripts here (as the FSMs they would be)."""
+ out = []
+ g = next((c.get("v") for c in o["c"] if c.get("class") == "GrubBGControl" and c.get("v")), None)
+ if g is not None:
+ # GrubBGControl: a grub back home, there once that many are saved
+ out.append({"fsm": _fsm("Grub BG", "Init", {"N": ["int", 0]}, [
+ ("Init", [("GetPlayerDataInt", {"intName": "grubsCollected", "storeValue": "$N"}),
+ ("IntCompare", {"integer1": "$N", "integer2": g["grubNumber"], "lessThan": ["event", "HIDE"],
+ "equal": None, "greaterThan": None, "everyFrame": False})], {"HIDE": "Hide"}),
+ ("Hide", [("ActivateGameObject", {"gameObject": "Owner", "activate": False, "recursive": False,
+ "resetOnExit": False, "everyFrame": False})], {})])})
+ p = rm.by_id.get(o.get("parent"))
+ if o["name"] == "Wave Region" and p is not None and any(c.get("class") == "GrubBGControl" for c in p["c"]):
+ # (its wave as the Knight comes into its region; then its bounce again)
+ out.append({"fsm": _fsm("Grub BG Wave", "Init", {"Parent": ["gameObject", None]}, [
+ ("Init", [("GetParent", {"gameObject": "Owner", "storeResult": "$Parent"})], {"FINISHED": "Idle"}),
+ ("Idle", [("Tk2dPlayAnimation", {"gameObject": "$Parent", "animLibName": "", "clipName": "Home Bounce"}),
+ ("Trigger2dEvent", {"trigger": 0, "collideTag": "", "collideLayer": "", "sendEvent": ["event", "WAVE"],
+ "storeCollider": None})], {"WAVE": "Wave"}),
+ ("Wave", [("Tk2dPlayAnimationWithEvents", {"gameObject": "$Parent", "clipName": "Home Wave",
+ "animationTriggerEvent": None,
+ "animationCompleteEvent": ["event", "FINISHED"]})],
+ {"FINISHED": "Idle"})])})
+ return out
+
+
# FSMs left out (what this port does not have: the dream nail, sounds...)
SKIP_FSMS = {"npc_dream_dialogue", "Dream Dialogue", "Rotate", "Shop Open Voice"}
# objects left out (effects drawn by the C code, or nothing at all; the dream nail's; Dreamer Scene 1's Knight Lift,
@@ -37,6 +100,10 @@ SKIP_CLASSES = {"SpellGetOrb", "ParticleSystem"}
SKIP_NAMES = {"Dream Dialogue", "Dream Dialogue Flower", "Flower", "Flower Give", "white_light", "white_light 1",
"Knight Lift"}
MAX_OBJS, MAX_FSMS, MAX_VARS = 32, 24, 256 # (src/vm.c)
+# the grubs in this part of the game (Crossroads_03, Fungus1_21): the Grubfather's rewards past them never come
+GRUBS = 2
+# the ints ConvertIntToString turns into strings here (the Grubfather's rewards given)
+INT_STRINGS = range(0, GRUBS + 1)
# the game's own objects
SPECIAL = {"Hero": 0xFF00, "HeroLight": 0xFF01, "DialogueManager": 0xFF02, "DialogueText": 0xFF03, "AreaTitle": 0xFF04,
@@ -46,11 +113,11 @@ O_NONE = 0xFFFF
# PlayerData ints (src/vm.c: pd_int)
PD_INTS = ["MPCharge", "health", "maxHealth", "geo", "fireballLevel", "quakeLevel", "screamLevel", "shaman", "elderbug",
"permadeathMode", "nailDamage", "hornetGreenpath", "quirrelEggTemple", "charmsOwned", "trinket1", "trinket2",
- "trinket3", "trinket4", "rancidEggs", "ore"]
+ "trinket3", "trinket4", "rancidEggs", "ore", "grubsCollected", "grubRewards"]
# PlayerData bools kept elsewhere (src/vm.c)
PD_SPECIAL = {"disablePause": 0xFFF0, "hasSpell": 0xFFF1, "canDash": 0xFFF2}
# PlayerData bools that keep their new game value all through this part of the game
-PD_CONST = {"backerCredits": False, "equippedCharm_10": False, "elderbugGaveFlower": False, "elderbugRequestedFlower": False,
+PD_CONST = {"backerCredits": False, "finalGrubRewardCollected": False, "equippedCharm_10": False, "elderbugGaveFlower": False, "elderbugRequestedFlower": False,
"xunFlowerBroken": False, "hasXunFlower": False, "openedBlackEggDoor": False,
"visitedCrossroadsInfected": False, "defeatedNightmareGrimm": False, "jijiDoorUnlocked": False,
"visitedCliffs": False, "mineLiftOpened": False, "brettaRescued": False, "elderbugHistory2": False,
@@ -211,15 +278,29 @@ op("GetObjAlpha", ("gameObject", "o"), ("store", "F"))
op("FlingObject", ("flungObject", "o"), ("speedMin", "f"), ("speedMax", "f"), ("angleMin", "f"), ("angleMax", "f"),
("ox", "k"), ("oy", "k"), ("hx", "k"), ("hy", "k"), ("bounce", "k"), ("friction", "k"))
op("GetSpeed2d", ("gameObject", "o"), ("storeResult", "F"), ("everyFrame", "n"))
-op("SendRandomEvent", ("events", "e*"))
+op("SendRandomEvent", ("events", "e*"), ("weights", "w*"))
+# (FlingObjectsFromGlobalPool of geo: GeoControl's, the C code's (enemy.c), from a spawn point)
+# (ConvertIntToString: the string of each int it can be, here from 0)
+op("IntToString", ("intVariable", "i"), ("stringVariable", "S"), ("strings", "x*"))
+op("FlingGeo", ("type", "n"), ("count", "n"), ("spawnPoint", "o"), ("speedMin", "f"), ("speedMax", "f"),
+ ("angleMin", "f"), ("angleMax", "f"))
op("IncrementPlayerDataInt", ("intName", "q"))
op("ListenForInventory", ("wasPressed", "e"))
+op("WaitRandom", ("timeMin", "f"), ("timeMax", "f"), ("finishEvent", "e"))
+# (debris the C code flings (obj.c's pieces), from an object's place by (dx, dy): its sprite, how it falls, bounces and
+# spins (flags: 1 spun, 2 turned at random); hide: that object off as its piece goes; snap: set on the ground below,
+# dy above it (SnapToGround), not flung)
+op("FlingPiece", ("gameObject", "o"), ("hide", "n"), ("snap", "n"), ("sprite", "x"), ("layer", "n"), ("order", "x"),
+ ("flags", "n"), ("dx", "k"), ("dy", "k"), ("z", "k"), ("rot", "k"), ("gravity", "k"), ("bounce", "k"), ("spin", "k"),
+ ("mirror", "k"), ("speedMin", "f"), ("speedMax", "f"), ("angleMin", "f"), ("angleMax", "f"))
# HeroController's methods the scripts call (HeroCall's method)
HERO_METHODS = ["RelinquishControl", "RegainControl", "StopAnimationControl", "StartAnimationControl", "FaceLeft",
"FaceRight", "CanTalk", "PreventCastByDialogueEnd", "SetBackOnGround", "AddMPCharge",
"FindGroundPoint", "SetBenchRespawn", "SetHazardRespawn", "RelinquishControlNotVelocity",
"SetCState", "SaveGame", "AffectedByGravity", "ResetHardLandingTimer", "StopPlayingAudio", "CanInspect"]
+# the geo prefabs (Geo Small, Med, Large): GeoControl's types
+GEO_PREFABS = {("resources.assets", 5736): 0, ("resources.assets", 6395): 1, ("resources.assets", 6376): 2}
# the prompt marker the pool gives (Arrow Prompt New): a script's own, shown and hidden as ShowPromptMarker's
PROMPT_PREFAB = ("resources.assets", 6142)
# prefabs CreateObject makes that the scripts go on with (made beforehand, off): (file, path id)
@@ -238,7 +319,7 @@ CHARMS = [1, 2, 3, 4, 6, 7, 8, 14, 18, 19, 20]
GAME_OBJECTS = {"Hornet Boss 1": 0xFF0C}
O_CHARM_TUTE = 0xFF0E # (src/vm.c)
# what a trigger's Trigger2dEvent hears, by collideTag: the Knight (any), a spell
-TRIGGER_TAGS = {None: 0, "": 0, "Player": 0, "Untagged": 0, "Hero Spell": 1}
+TRIGGER_TAGS = {None: 0, "": 0, "Player": 0, "Untagged": 0, "Hero Spell": 1, "Nail Attack": 2}
# the items the message shows (text.MSGS's order), by Msg Control's Item
MSG_ITEMS = {"Fireball": 0, "Dash": 1}
# camera shake events
@@ -292,6 +373,8 @@ class Room:
def want(self, o):
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
def add_tree(self, o):
@@ -369,6 +452,8 @@ def _string_values(rm, f, v, depth=0):
P = dict(a["params"])
if a["name"] == "SetStringValue" and P.get("stringVariable") == v and depth < 4:
out += _string_values(rm, f, P.get("stringValue"), depth + 1)
+ elif a["name"] == "ConvertIntToString" and P.get("stringVariable") == v:
+ out += [str(i) for i in INT_STRINGS]
elif a["name"] == "BuildString" and P.get("storeResult") == v and depth < 4:
sep = P.get("separator") or ""
parts = [_string_values(rm, f, q, depth + 1) for q in P.get("stringParts") or []]
@@ -521,6 +606,18 @@ class Compiler:
self.consts.append(v)
return self.nvars + self.consts.index(v)
+ 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("$")):
+ return None
+ for s in self.f["states"]:
+ for a in s["actions"]:
+ Q = dict(a["params"])
+ if a["name"] == "FindChild" and Q.get("storeResult") == v and Q.get("gameObject") == "Owner":
+ return next((q for q in self.rm.by_id.values() if q.get("parent") == self.o["id"] and
+ q["name"] == Q.get("childName")), None)
+ return None
+
def obj_value(self, v):
if v == "Owner":
return OWNER
@@ -658,6 +755,14 @@ class Compiler:
return struct.pack("<f", float(v or 0))
if kind == "x":
return struct.pack("<H", v)
+ if kind == "w*":
+ # (weights: their shares of 255; none: all alike)
+ w = [float(x) for x in v or []]
+ if len(set(w)) <= 1:
+ return bytes([0])
+ return bytes([len(w)]) + bytes(int(round(255 * x / sum(w))) for x in w)
+ if kind == "x*":
+ return bytes([len(v)]) + b"".join(struct.pack("<H", q) for q in v)
if kind in ("i*", "b*", "e*"):
v = v or []
out = bytes([len(v)])
@@ -686,7 +791,8 @@ class Compiler:
"ForceHeroFootstepSound", "SendEventToRegister", "AddTrackTrigger", "PlayVibration",
"VibrationPlayerStop", "TransitionToAudioSnapshot", "SetAudioPitch", "SetAudioVolume",
"AudioPlayInState", "FadeAudio", "PlayRandomSound", "SetRotation", "RandomFloat",
- "GetLastEvent", "SetBoxCollider2DSize", "Tk2dSpriteSetColor", "SetTextMeshProColor"):
+ "GetLastEvent", "SetBoxCollider2DSize", "Tk2dSpriteSetColor", "SetTextMeshProColor",
+ "AudioPlayRandom", "SetName", "GameObjectIsNull"):
return None
if n in ("PlayerDataBoolTest",):
return self.emit(n, P)
@@ -794,11 +900,47 @@ class Compiler:
if P.get("objectName"):
return self.emit("FindGameObject", P)
return None # (by tag: the main camera)
+ if n == "FlingObjects":
+ c = self.static_child(P.get("containerObject"))
+ if c is None:
+ self.problem("FlingObjects %r" % P.get("containerObject"))
+ return None
+ out = b""
+ for cid in c.get("children", []):
+ q = self.rm.by_id[cid]
+ pp = _piece(q.get("_doc") or self.rm.d, q)
+ if pp is not None:
+ out += self.emit("FlingPiece", dict(pp, gameObject=("objindex", self.rm.obj(q)), hide=1,
+ speedMin=P.get("speedMin"), speedMax=P.get("speedMax"),
+ angleMin=P.get("angleMin"), angleMax=P.get("angleMax")))
+ return out or None
+ if n == "SpawnRandomObjects":
+ r = P.get("gameObject")
+ import ents
+ f, pid = ents._ref_file(self.o.get("_doc") or self.rm.d, [r[1], r[2]])
+ d2 = unity.prefab(f, pid)
+ pp = _piece(d2, d2["objects"][0])
+ if pp is None or (P.get("originVariation") or 0) != 0:
+ self.problem("SpawnRandomObjects %s %s" % (f, pid))
+ return None
+ pos = P.get("position") or [0, 0, 0]
+ one = self.emit("FlingPiece", dict(pp, gameObject=P.get("spawnPoint"), dx=pos[0], dy=pos[1],
+ speedMin=P.get("speedMin"), speedMax=P.get("speedMax"),
+ angleMin=P.get("angleMin"), angleMax=P.get("angleMax")))
+ return one * int(P.get("spawnMax") or 1) # (spawnMin .. spawnMax: as many each time here)
if n == "CreateObject":
r = P.get("gameObject")
if isinstance(r, (list, tuple)) and r and r[0] == "ref":
import ents
f, pid = ents._ref_file(self.o.get("_doc") or self.rm.d, [r[1], r[2]])
+ d2 = unity.prefab(f, pid)
+ q = d2["objects"][0]
+ if len(d2["objects"]) == 1 and any(c.get("class") == "SnapToGround" for c in q["c"]):
+ # (a prop set on the ground where it is made: a piece that stays)
+ pp, box = _piece(d2, q, rigid=False), next((ents._box(q, c) for c in q["c"] if c["type"] == "BoxCollider2D"), None)
+ pos = P.get("position") or [0, 0, 0]
+ return self.emit("FlingPiece", dict(pp, gameObject=P.get("spawnPoint"), snap=1, dx=pos[0],
+ dy=q["pos"][1] - box[1]))
if (f, pid) in PREFAB_SPAWNS:
pos = P.get("position") or [None, None, None]
obj = self.rm.add_prefab(f, pid, (self.o["id"], self.where, P.get("storeObject")))
@@ -863,7 +1005,7 @@ class Compiler:
return self.emit("HeroCall", {"method": HERO_METHODS.index(fn), "store": None,
"a": float(v) if isinstance(v, (int, float)) and not isinstance(v, bool) else 0})
if fn in ("advanceTypewriter", "TimePasses", "StoryRecord_acquired", "StoryRecord_visited", "SetActionString",
- "RefreshButtonIcon", "StopBounce"):
+ "RefreshButtonIcon", "StopBounce", "CheckGrubAchievements", "AddToGrubList"):
return None
self.problem("SendMessage %s" % fn)
return None
@@ -928,10 +1070,25 @@ class Compiler:
return self.emit("SetStringValue", {"stringVariable": P.get("storeResult"),
"stringValue": unity.tag_name(o.get("tag", 0)), "everyFrame": 0})
if n == "SendRandomEvent":
- w = [x for x in P.get("weights") or []]
- if len(set(w)) > 1 or (P.get("delay") or 0) >= 0.001:
+ if (P.get("delay") or 0) >= 0.001:
self.problem("SendRandomEvent %r" % P)
return self.emit(n, P)
+ if n == "FlingObjectsFromGlobalPool":
+ import ents
+ r = P.get("gameObject")
+ ref = ents._ref_file(self.o.get("_doc") or self.rm.d, [r[1], r[2]]) if isinstance(r, (list, tuple)) else None
+ if ref not in GEO_PREFABS or P.get("spawnMin") != P.get("spawnMax") or P.get("originVariationX") or \
+ P.get("originVariationY") or P.get("position"):
+ self.problem("FlingObjectsFromGlobalPool %r" % (ref,))
+ return None
+ return self.emit("FlingGeo", dict(P, type=GEO_PREFABS[ref], count=P.get("spawnMax")))
+ if n == "ConvertIntToString":
+ if P.get("format"):
+ self.problem("ConvertIntToString format %r" % P.get("format"))
+ return self.emit("IntToString", dict(P, strings=[STR.id(str(i)) for i in INT_STRINGS]))
+ if n == "CheckGeoCap":
+ # (the geo the Knight can hold: far more than there is here)
+ return self.emit("SendEvent", {"eventTarget": "Self", "sendEvent": P.get("IsUnderCapEvent"), "delay": 0})
if n == "FlingObject":
o = self.o if P.get("flungObject") == "Owner" else None
if o is None:
@@ -1026,6 +1183,8 @@ def _animator(o):
def prepare(rooms, sprites, texts):
"""Compiles the rooms' scripts; registers their characters' animation libraries as actors (before actors.build)."""
import actors, ents, tk2d
+ global PIECE_SPRITES
+ PIECE_SPRITES = sprites.id
for name, prefixes in ROOMS.items():
if name not in rooms:
continue
@@ -1040,7 +1199,7 @@ def prepare(rooms, sprites, texts):
while done < len(rm.objs):
o = rm.objs[done]
done += 1
- for c in o["c"]:
+ for c in o["c"] + _behaviours(rm, o):
f = c.get("fsm")
if not f or f["name"] in SKIP_FSMS:
continue
@@ -1140,10 +1299,13 @@ def room_blob(name, clip_index, sprites, owners=(), persist=None):
sy = float(np.hypot(m[0, 1], m[1, 1])) * (1 if m[1, 1] >= 0 else -1)
fl = (OF_ACTIVE if o.get("self_active", o["active"]) else 0)
box = None
+ # (one its scripts hear the nail hit: its collider, a trigger or not, is what the nail's trigger meets)
+ nail = any(a["name"] == "Trigger2dEvent" and dict(a["params"]).get("collideTag") == "Nail Attack"
+ for c in o["c"] if c.get("fsm") for s in c["fsm"]["states"] for a in s["actions"])
for c in o["c"]:
if c["type"] in ("BoxCollider2D", "CircleCollider2D", "PolygonCollider2D") and c.get("v"):
b = ents._box(o, c)
- if b and c["v"].get("m_IsTrigger") and box is None:
+ if b and (c["v"].get("m_IsTrigger") or nail) and box is None:
box = b
if b and c["v"].get("m_Enabled", 1):
fl |= OF_COLLIDER