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: Greenpath toll gates open from behind (Gate Saver); Crossroads hidden room's own map piece
Mason Chen06a9ca5bebd7
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.binindex fbdb667c..7c794f06 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 8bfef383..be3504c2 100644--- a/games/hollowknight/src/data.h+++ b/games/hollowknight/src/data.h@@ -673,7 +673,7 @@#define SPRITE_CORPSE_NAIL 3027#define SPRITE_FK_BARREL 3028#define SPRITE_FK_STAFF 3029-#define SPRITE_DIGIT0 3594+#define SPRITE_DIGIT0 3595#define STYLE_DIALOGUE 0#define STYLE_PROMPT 1#define STYLE_TITLE_L 2@@ -876,6 +876,7 @@#define VMOP_LISTENFORQUICKMAP 135#define VMOP_MAPUPDATEMSG 136#define VMOP_UPDATEGAMEMAP 137+#define VMOP_SCENEVISITED 138#define VMEV_FINISHED 0#define VMEV_CONVO_FINISH 1#define VMEV_CONVO_START 2@@ -924,10 +925,10 @@#define VMEV_FIRST_MAP_DOWN 45#define VMEV_FK_RAGE_COMPLETE 46#define VMSTR_NPC_TITLE 14-#define VMSTR_VISITED 678-#define VMSTR_DISPLAY_RIGHT 679+#define VMSTR_VISITED 682+#define VMSTR_DISPLAY_RIGHT 683#define VMSTR_HORNET_SAVER 201-#define VMSTR_ITEM 568+#define VMSTR_ITEM 570#define STR_ATTACK_RANGE 24#define STR_EVADE_RANGE 50#define STR_SPIT_RANGE 51@@ -1238,49 +1239,49 @@#define TXT_STAG_CTRL_CANCEL 311#define STAG_SCENES_STR {137, 136, 138}#define STAG_SCENES_ROOM {4, 19, 36}-#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 381, 0x14u}, {2, 23, 130, -0.0400f, -7.8800f, 384, 0x400020u}, {25, 16, 131, 16.3100f, -7.8700f, 385, 0x40u}}-#define MAP_ROOMS {{0, 1, 3161, 3162, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 0, 3168, 3169, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 12, -1, -1, -1.5030f, 5.1050f, 0.0000f, 0.0000f, 0x000000, 0}, {1, 255, 3171, 3172, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 19, 3173, -1, 1.4650f, 4.4640f, 0.6500f, 0.3100f, 0xB5DDFB, 0}, {1, 255, 3174, 3175, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 15, 3176, 3177, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 9, 3178, -1, -3.0980f, 6.4880f, 1.1110f, 0.4800f, 0xB5DDFB, 0}, {1, 10, 3180, 3181, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 25, 3182, -1, -0.6440f, 4.4430f, 0.7000f, 0.3700f, 0xB5DDFB, 0}, {1, 14, 3184, 3185, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 20, 3186, 3187, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 17, 3188, 3189, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 16, 3190, 3191, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3192, 3193, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3194, 3195, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 26, 3196, -1, -3.7180f, 5.7650f, 2.3517f, 0.4300f, 0xB5DDFB, 0}, {1, 13, 3198, 3199, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 24, 3200, 3201, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 8, 3202, 3203, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 11, 3204, -1, -1.5030f, 5.1050f, 0.8500f, 0.8900f, 0xB5DDFB, 0}, {1, 21, 3205, -1, 3.7290f, 3.4460f, 2.4100f, 0.6600f, 0xB5DDFB, 0}, {1, 18, 3207, 3208, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 6, 3209, 3210, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 5, 3211, 3212, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 3213, 3214, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 33, 3215, 3216, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 32, 3217, 3218, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 3219, 3220, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 35, 3221, -1, -12.3910f, 5.0270f, 0.5700f, 1.9700f, 0xCFFFC3, 0}, {2, 34, 3222, 3223, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3224, 3225, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 30, 3226, -1, -9.2170f, 5.6940f, 1.2300f, 0.4400f, 0xCFFFC3, 0}, {2, 36, 3227, -1, -12.9760f, 5.8120f, 0.6000f, 0.3000f, 0xCFFFC3, 0}, {2, 255, 3228, 3229, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3230, 3231, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 37, 3232, 3233, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 31, 3234, -1, -10.4130f, 5.6780f, 1.1700f, 0.5500f, 0xCFFFC3, 0}, {2, 29, 3235, 3236, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 28, 3237, 3238, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 27, 3239, 3240, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}-#define MAP_PINS {{0, 0, 3163, -2.0390f, 7.7500f, 133, -1}, {0, 0, 3164, -1.6430f, 7.7500f, 137, -1}, {0, 0, 3165, -2.4700f, 7.7500f, 135, 122}, {0, 0, 3166, -1.2540f, 7.7600f, 135, 123}, {1, 1, 3170, -6.2100f, 7.6800f, 134, -1}, {2, 1, 3170, -1.3150f, 5.0920f, 134, -1}, {4, 0, 3164, 1.2400f, 4.4520f, 137, -1}, {4, 0, 3163, 1.6210f, 4.4490f, 133, -1}, {7, 0, 3179, -3.0697f, 6.4597f, 135, -1}, {9, 0, 3163, -0.3430f, 4.4060f, 133, -1}, {9, 0, 3183, -0.7200f, 4.3930f, 136, -1}, {20, 0, 3163, -1.6940f, 5.0880f, 133, -1}, {21, 0, 3206, 4.5530f, 3.3700f, 135, 124}, {21, 0, 3163, 4.9480f, 3.3820f, 133, -1}, {26, 1, 3170, -10.9970f, 6.6240f, 134, -1}, {27, 0, 3163, -11.2580f, 4.9690f, 133, -1}, {33, 0, 3163, -12.8160f, 5.7890f, 133, -1}, {33, 0, 3164, -13.1960f, 5.7970f, 137, -1}, {39, 0, 3163, -7.6610f, 6.0700f, 133, -1}}-#define MAP_NEXT {{0, 3167, -1.0730f, 6.4850f, 180.0000f, 380, -1.0730f, 6.1870f, 1, -1}, {16, 3197, -5.2607f, 5.8454f, 90.0000f, 382, -5.5969f, 6.0434f, 2, 16}, {24, 3167, -1.0730f, 7.2500f, 0.0000f, 379, -1.0930f, 7.9120f, 1, -1}, {40, 3167, -4.5300f, 5.8450f, -90.0000f, 380, -4.1075f, 6.0470f, 0, 6}}-#define MAP_NAMES {{0, -1, 378, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 379, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 380, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {1, 20, 383, 3.4800f, 5.6971f, 0xB5DCFB, 1, 0}, {2, -1, 382, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}+#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 381, 0x14u}, {2, 24, 130, -0.0400f, -7.8800f, 384, 0x400020u}, {26, 16, 131, 16.3100f, -7.8700f, 385, 0x40u}}+#define MAP_ROOMS {{0, 1, 3161, 3162, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 0, 3168, 3169, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 12, -1, -1, -1.5030f, 5.1050f, 0.0000f, 0.0000f, 0x000000, 0}, {1, 38, 3171, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 3172, 3173, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 19, 3174, -1, 1.4650f, 4.4640f, 0.6500f, 0.3100f, 0xB5DDFB, 0}, {1, 255, 3175, 3176, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 15, 3177, 3178, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 9, 3179, -1, -3.0980f, 6.4880f, 1.1110f, 0.4800f, 0xB5DDFB, 0}, {1, 10, 3181, 3182, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 25, 3183, -1, -0.6440f, 4.4430f, 0.7000f, 0.3700f, 0xB5DDFB, 0}, {1, 14, 3185, 3186, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 20, 3187, 3188, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 17, 3189, 3190, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 16, 3191, 3192, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3193, 3194, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3195, 3196, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 26, 3197, -1, -3.7180f, 5.7650f, 2.3517f, 0.4300f, 0xB5DDFB, 0}, {1, 13, 3199, 3200, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 24, 3201, 3202, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 8, 3203, 3204, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 11, 3205, -1, -1.5030f, 5.1050f, 0.8500f, 0.8900f, 0xB5DDFB, 0}, {1, 21, 3206, -1, 3.7290f, 3.4460f, 2.4100f, 0.6600f, 0xB5DDFB, 0}, {1, 18, 3208, 3209, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 6, 3210, 3211, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 5, 3212, 3213, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 3214, 3215, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 33, 3216, 3217, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 32, 3218, 3219, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 3220, 3221, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 35, 3222, -1, -12.3910f, 5.0270f, 0.5700f, 1.9700f, 0xCFFFC3, 0}, {2, 34, 3223, 3224, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3225, 3226, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 30, 3227, -1, -9.2170f, 5.6940f, 1.2300f, 0.4400f, 0xCFFFC3, 0}, {2, 36, 3228, -1, -12.9760f, 5.8120f, 0.6000f, 0.3000f, 0xCFFFC3, 0}, {2, 255, 3229, 3230, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3231, 3232, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 37, 3233, 3234, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 31, 3235, -1, -10.4130f, 5.6780f, 1.1700f, 0.5500f, 0xCFFFC3, 0}, {2, 29, 3236, 3237, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 28, 3238, 3239, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 27, 3240, 3241, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}+#define MAP_PINS {{0, 0, 3163, -2.0390f, 7.7500f, 133, -1}, {0, 0, 3164, -1.6430f, 7.7500f, 137, -1}, {0, 0, 3165, -2.4700f, 7.7500f, 135, 122}, {0, 0, 3166, -1.2540f, 7.7600f, 135, 123}, {1, 1, 3170, -6.2100f, 7.6800f, 134, -1}, {2, 1, 3170, -1.3150f, 5.0920f, 134, -1}, {5, 0, 3164, 1.2400f, 4.4520f, 137, -1}, {5, 0, 3163, 1.6210f, 4.4490f, 133, -1}, {8, 0, 3180, -3.0697f, 6.4597f, 135, -1}, {10, 0, 3163, -0.3430f, 4.4060f, 133, -1}, {10, 0, 3184, -0.7200f, 4.3930f, 136, -1}, {21, 0, 3163, -1.6940f, 5.0880f, 133, -1}, {22, 0, 3207, 4.5530f, 3.3700f, 135, 124}, {22, 0, 3163, 4.9480f, 3.3820f, 133, -1}, {27, 1, 3170, -10.9970f, 6.6240f, 134, -1}, {28, 0, 3163, -11.2580f, 4.9690f, 133, -1}, {34, 0, 3163, -12.8160f, 5.7890f, 133, -1}, {34, 0, 3164, -13.1960f, 5.7970f, 137, -1}, {40, 0, 3163, -7.6610f, 6.0700f, 133, -1}}+#define MAP_NEXT {{0, 3167, -1.0730f, 6.4850f, 180.0000f, 380, -1.0730f, 6.1870f, 1, -1}, {17, 3198, -5.2607f, 5.8454f, 90.0000f, 382, -5.5969f, 6.0434f, 2, 16}, {25, 3167, -1.0730f, 7.2500f, 0.0000f, 379, -1.0930f, 7.9120f, 1, -1}, {41, 3167, -4.5300f, 5.8450f, -90.0000f, 380, -4.1075f, 6.0470f, 0, 6}}+#define MAP_NAMES {{0, -1, 378, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 379, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 380, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {1, 21, 383, 3.4800f, 5.6971f, 0xB5DCFB, 1, 0}, {2, -1, 382, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}#define MAP_QUICK_K 1.5500f-#define MAP_SHADE {{3241, 0.0055f, -0.0110f, 178}, {3242, 0.0000f, 0.0000f, 255}}-#define MAP_MARKERS {3243, 3244, 3245, 3246}+#define MAP_SHADE {{3242, 0.0055f, -0.0110f, 178}, {3243, 0.0000f, 0.0000f, 255}}+#define MAP_MARKERS {3244, 3245, 3246, 3247}#define MAP_COMPASS_K 0.7000f#define MAP_BG_A 0.4438f#define MAP_TITLE {0.0000f, 7.5363f}-#define MAP_TITLE_BACK {3247, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}-#define MAP_NO_MAP {3248, 0.0000f, 0.9400f}+#define MAP_TITLE_BACK {3248, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}+#define MAP_NO_MAP {3249, 0.0000f, 0.9400f}#define MAP_NO_MAP_MSG {386, -0.0600f, -1.2932f}-#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 387, 3249, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}+#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 387, 3250, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}#define MAP_MSG_K 0.7000f#define FIRSTMAP_BG_A 0.6410f#define FIRSTMAP_TEXTS {{388, 0.0000f, 5.0305f}, {182, 0.0000f, -0.8796f}, {389, 0.0000f, -3.2895f}, {390, 0.0000f, -4.6996f}}-#define FIRSTMAP_PIECES {{3250, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3251, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3252, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}+#define FIRSTMAP_PIECES {{3251, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3252, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3253, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}#define FIRSTMAP_KEY {391, 0.0900f, -2.3200f}-#define MAP_WIDE {{{3253, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 392, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3254, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 393, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3255, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 394, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}}+#define MAP_WIDE {{{3254, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 392, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3255, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 393, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3256, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 394, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}}#define MAP_WIDE_GREY 0x5C#define MAP_WIDE_NAME_GREY 0x5B#define MAP_WIDE_COMPASS_K 0.8700f#define MAP_ZOOM {0.2800f, -2.8000f, 0.4360f, 1.3000f}#define MAP_PAN {-1.4400f, 4.5500f, -8.6420f, -5.5800f}#define MAP_PAN_SPEED 8.0000f-#define MAP_PAN_ARROWS {{3256, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3256, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3256, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3256, 17.1900f, -7.1700f, 1.0f, -90.0000f}}-#define MAP_ACT_CONFIRM {{3257, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {395, 396, 396}}-#define MAP_ACT_MARKER {{3257, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {397, 398, 399}}-#define MAP_ACT_CANCEL {{3257, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {311, 311, 311}}-#define MAP_ACT_CHANGE {{3257, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {400, 400, 400}}-#define MAP_ACT_KEY {{3257, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {401, 402, 403}}-#define MAP_KEY_BB {3258, 13.6200f, 3.4200f, 0.3781f, 1.0000f}+#define MAP_PAN_ARROWS {{3257, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3257, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3257, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3257, 17.1900f, -7.1700f, 1.0f, -90.0000f}}+#define MAP_ACT_CONFIRM {{3258, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {395, 396, 396}}+#define MAP_ACT_MARKER {{3258, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {397, 398, 399}}+#define MAP_ACT_CANCEL {{3258, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {311, 311, 311}}+#define MAP_ACT_CHANGE {{3258, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {400, 400, 400}}+#define MAP_ACT_KEY {{3258, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {401, 402, 403}}+#define MAP_KEY_BB {3259, 13.6200f, 3.4200f, 0.3781f, 1.0000f}#define MAP_KEY_STEP -0.8250f-#define MAP_KEY_ROWS {{{3259, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 404, {12.7550f, -1.5413f, 15.3500f}}, {{3260, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 405, {12.7550f, -1.5413f, 15.3500f}}, {{3261, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 406, {12.7550f, -1.5413f, 15.3500f}}, {{3262, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 407, {12.7550f, -1.5413f, 15.3500f}}, {{3263, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 408, {12.7550f, -1.5413f, 15.3500f}}}+#define MAP_KEY_ROWS {{{3260, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 404, {12.7550f, -1.5413f, 15.3500f}}, {{3261, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 405, {12.7550f, -1.5413f, 15.3500f}}, {{3262, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 406, {12.7550f, -1.5413f, 15.3500f}}, {{3263, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 407, {12.7550f, -1.5413f, 15.3500f}}, {{3264, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 408, {12.7550f, -1.5413f, 15.3500f}}}#define MAP_KEY_FLAGS {133, 134, 135, 136, 137}#define MAP_KEY_N 5-#define MAP_MM_PIECES {{3264, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3265, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3266, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3267, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}-#define MAP_MM_MARKERS {3268, 3269, 3270, 3271}+#define MAP_MM_PIECES {{3265, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3266, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3267, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3268, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}+#define MAP_MM_MARKERS {3269, 3270, 3271, 3272}#define MAP_MM_AMOUNT {0.0000f, -0.6416f, 1.0614f}#define MAP_MM_ROW {0.0000f, 0.4400f, 1.9000f, 1.4333f, -12.8200f}-#define MAP_MM_PLACE {3272, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}+#define MAP_MM_PLACE {3273, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}#define MAP_MM_RADII 0.8900f#define MAP_MM_UI_PAUSE 0.2000f#define TXT_KEY_SHIFT 409diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.hindex 072a4847..c55579a2 100644--- a/games/hollowknight/src/game.h+++ b/games/hollowknight/src/game.h@@ -336,6 +336,7 @@ void map_hud_tick(void);void map_draw(void);bool map_shown(void);void map_room_entered(void); /* (scenesVisited) */+void map_scene_visited(int r); /* (AddToScenesVisited: a map piece of its own, after the rooms) */void map_cocoon_broken(void); /* (AddToCocoonList) */bool map_update(void); /* UpdateGameMap: the quill's -> any room newly mapped */void map_quick(bool open); /* (a bench's: OPEN QUICK MAP, CLOSE QUICK MAP) */diff --git a/games/hollowknight/src/map.c b/games/hollowknight/src/map.cindex d575a45e..7f963f0e 100644--- a/games/hollowknight/src/map.c+++ b/games/hollowknight/src/map.c@@ -50,6 +50,7 @@ static void set_bit(uint8_t *b, int i) {}void map_room_entered(void) { set_bit(g_pd.rooms_visited, g_room.id); } /* (SceneManager: scenesVisited) */+void map_scene_visited(int r) { set_bit(g_pd.rooms_visited, r); } /* (AddToScenesVisited: a map piece) */void map_cocoon_broken(void) { set_bit(g_pd.rooms_cocoon, g_room.id); } /* (AddToCocoonList) */static bool have_area(int a) { return areas[a].have == -1 || (areas[a].have >= 0 && pd_flag(areas[a].have)); }diff --git a/games/hollowknight/src/vm.c b/games/hollowknight/src/vm.cindex 47004ce9..17fc0635 100644--- a/games/hollowknight/src/vm.c+++ b/games/hollowknight/src/vm.c@@ -1392,6 +1392,9 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {if (vm.fsms[i].owner == o && vm.fsms[i].name == fname) set_var(&vm.fsms[i], slot, x);return true;}+ case VMOP_SCENEVISITED:+ map_scene_visited(rb(&r));+ return true;case VMOP_STARTCONVERSATION:dialogue_start(rv(&r));return true;diff --git a/games/hollowknight/tools/pack.py b/games/hollowknight/tools/pack.pyindex 467a07ad..583a9978 100644--- a/games/hollowknight/tools/pack.py+++ b/games/hollowknight/tools/pack.py@@ -569,8 +569,8 @@ def main():fleurs.update(collect.build())fleurs.update(stag.build(SPRITES, TEXTS, hud_res, actors.clip_id, ents.pd_flags(), vm.STR.id, ROOMS))import gamemap- fleurs.update(gamemap.build(SPRITES, TEXTS, hud_res, ROOMS, ents.pd_flags(),- lambda r: scene.settings(unity.scene(r)).get("map_zone") or 0))+ fleurs.update(gamemap.build(SPRITES, TEXTS, hud_res, list(ROOMS) + list(vm.MAP_SCENES), ents.pd_flags(),+ lambda r: scene.settings(unity.scene(vm.MAP_SCENES.get(r, r))).get("map_zone") or 0))fleurs["ROOM_ZONES"] = "{%s}" % ", ".join(str(scene.settings(unity.scene(r)).get("map_zone") or 0) for r in ROOMS)for i, item in enumerate(text.MSGS):fleurs["MSG_" + item] = idiff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.pyindex a7cb1f5f..60d8f3bf 100644--- a/games/hollowknight/tools/vm.py+++ b/games/hollowknight/tools/vm.py@@ -48,12 +48,13 @@ ROOMS = {"Fungus1_03": ["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)"],+ "Toll Gate", "Toll Gate (1)", "Gate Saver"],# the world's other scripted things: walls that break, floors, a soul totem, tablets, a wall that turns on"Crossroads_08": ["Break Wall 2"],"Crossroads_04": ["_Scenery/Break Floor 1", "CamLock Destroyer", "_Transition Gates/Mender Door"],"Crossroads_19": ["Soul Totem mini_two_horned"],- "Crossroads_21": ["Breakable Wall", "Polygon_Collider_Cross_21 1/Roof Collider (1)", "Collapser Small"],+ "Crossroads_21": ["Breakable Wall", "Polygon_Collider_Cross_21 1/Roof Collider (1)", "Collapser Small",+ "Map Scene Region"],"Crossroads_07": ["Breakable Wall_Silhouette"],"Crossroads_30": ["Spa Region"],"Crossroads_33": ["_Props/full_wall_left", "Cornifer", "Cornifer Card"],@@ -85,6 +86,7 @@ def _piece(doc, q, rigid=True):"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)+ROOM_NAMES = [] # (prepare: the rooms, in their order)def _fsm(name, start, vars_, states):@@ -167,6 +169,8 @@ SKIP_NAMES = {"Dream Dialogue", "Dream Dialogue Flower", "Flower", "Flower Give"# battle gate: src/obj.c's, which FindChild finds)SKIP_PATHS = {("Crossroads_04", "_Transition Gates/Mender Door/Inspect"), ("Crossroads_10", "Fk Break Wall/Battle Gate 1")}MAX_OBJS, MAX_FSMS, MAX_VARS, MAX_ANIMS = 48, 27, 256, 20 # (src/vm.c)+# map pieces of their own a script marks visited (AddToScenesVisited), as their room's (src/map.c: after the rooms)+MAP_SCENES = {"Crossroads_21_b": "Crossroads_21"}# the grubs in this part of the game (Crossroads_03, Fungus1_21): the Grubfather's rewards past them never comeGRUBS = 2# the ints ConvertIntToString turns into strings here (the Grubfather's rewards given)@@ -421,6 +425,7 @@ op("SendEventByScale", ("gameObject", "o"), ("positiveEvent", "e"), ("negativeEvop("ListenForQuickMap", ("wasPressed", "e"))op("MapUpdateMsg") # (Map Update Msg: src/map.c's)op("UpdateGameMap", ("store", "B")) # (GameManager.UpdateGameMap: any room newly mapped)+op("SceneVisited", ("room", "n")) # (GameManager.AddToScenesVisited: a map piece of its own, MAP_SCENES)# HeroController's methods the scripts call (HeroCall's method)HERO_METHODS = ["RelinquishControl", "RegainControl", "StopAnimationControl", "StartAnimationControl", "FaceLeft",@@ -1308,6 +1313,10 @@ class Compiler:return Noneif beh == "GameManager" and m == "UpdateGameMap":return self.emit("UpdateGameMap", {"store": P.get("storeResult")})+ if beh == "GameManager" and m == "AddToScenesVisited":+ names = self.string_values(args[0]["s"] if isinstance(args[0], dict) else args[0])+ assert len(names) == 1 and names[0] in MAP_SCENES, names+ return self.emit("SceneVisited", {"room": len(ROOM_NAMES) + list(MAP_SCENES).index(names[0])})if beh == "GameMap" and m == "SetupMap":return None # (the map: drawn as PlayerData has it, src/map.c)if beh == "HeroPlatformStick" and m in ("Activate", "Deactivate"):@@ -1574,6 +1583,8 @@ def prepare(rooms, sprites, texts):import actors, ents, tk2dglobal PIECE_SPRITESPIECE_SPRITES = sprites.id+ ROOM_NAMES[:] = rooms+ assert len(rooms) + len(MAP_SCENES) <= 40 # (src/game.h: rooms_visited's bits)for name, prefixes in ROOMS.items():if name not in rooms:continue