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: Fungal Wastes: bounce shrooms, the Ogres' spit and slam, gas that hurts enemies, the area on the map, Quirrel over Mantis Village
Mason363a9667b2262e1
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.binindex c66a1e91..8a9af69b 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 ecf6f8a3..9ab28345 100644--- a/games/hollowknight/src/data.h+++ b/games/hollowknight/src/data.h@@ -1314,6 +1314,8 @@#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_WIDE_POS_2_DX 0.2400f+#define MAP_WIDE_POS_2_DY 1.1700f#define MAP_PAN {-1.4400f, 4.5500f, -8.6420f, -5.5800f}#define MAP_PAN_SPEED 8.0000f#define MAP_PAN_ARROWS {{3130, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3130, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3130, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3130, 17.1900f, -7.1700f, 1.0f, -90.0000f}}diff --git a/games/hollowknight/src/data_fw.bin b/games/hollowknight/src/data_fw.binindex e80a1343..77d3748c 100644Binary files a/games/hollowknight/src/data_fw.bin and b/games/hollowknight/src/data_fw.bin differdiff --git a/games/hollowknight/src/data_fw.h b/games/hollowknight/src/data_fw.hindex fb659bd6..27a62ab8 100644--- a/games/hollowknight/src/data_fw.h+++ b/games/hollowknight/src/data_fw.h@@ -630,84 +630,93 @@#define CLIP_COCOON_COCOON_SWEAT 589#define CLIP_COCOON_SCUTTLER_LAND 590#define CLIP_COCOON_SCUTTLER_RUN 591-#define CLIP_FX_IMPACT_LINES 592-#define CLIP_FX_SPLAT 593-#define CLIP_FX_SPLAT2 594-#define CLIP_FX_SWORD 595-#define CLIP_FIREBALL_BLAST 596-#define CLIP_FIREBALL_BALL 597-#define CLIP_FIREBALL_BALL_END 598-#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 599-#define CLIP_DRIP_IDLE 600-#define CLIP_DRIP_DRIP 601-#define CLIP_DRIP_FALL 602-#define CLIP_DRIP_IMPACT 603-#define CLIP_HORNETCS_IDLE 604-#define CLIP_HORNETCS_JUMP_FULL 605-#define CLIP_HORNETCS_THROW_SIDE_START 606-#define CLIP_HORNETCS_THROW_SIDE 607-#define CLIP_HORNETCS_HARPOON_SIDE 608-#define CLIP_HORNETCS_THREAD_1 609-#define CLIP_HORNETCS_POINT 610-#define CLIP_HORNETCS_EVADE_ANTIC 611-#define CLIP_HORNETCS_EVADE 612-#define CLIP_HORNETCS_SOFT_LAND 613-#define CLIP_HORNETCS_TURN 614-#define CLIP_HORNETCS_RUN 615-#define CLIP_BULLET_IDLE 616-#define CLIP_BULLET_IMPACT 617-#define CLIP_BULLET_SHOCKWAVE_SPURT 618-#define CLIP_GLOB_IDLE 619-#define CLIP_GLOB_LAND 620-#define CLIP_PROP0_DOOR_CLOSED 621-#define CLIP_PROP0_DOOR_OPEN_1 622-#define CLIP_PROP0_DOOR_OPEN_2 623-#define CLIP_PROP0_FLOOR_EXTEND 624-#define CLIP_PROP0_FLOOR_IDLE 625-#define CLIP_PROP0_FLOOR_RETRACT 626-#define CLIP_PROP0_GATE_CLOSE 627-#define CLIP_PROP0_GATE_IDLE 628-#define CLIP_PROP0_GATE_OPEN 629-#define CLIP_PROP0_IDLE 630-#define CLIP_PROP0_LEVER_ACTIVATED 631-#define CLIP_PROP0_LEVER_HIT 632-#define CLIP_PROP0_LEVER_IDLE 633-#define CLIP_PROP0_LEVER_UNHIT 634-#define CLIP_VM0_ARRIVE 635-#define CLIP_VM0_ARRIVE_SMOKE 636-#define CLIP_VM0_IDLE 637-#define CLIP_VM1_BELL_IDLE 638-#define CLIP_VM1_BELL_RING_R 639-#define CLIP_VM1_BELL_STAND 640-#define CLIP_VM1_BELL_STAND_APPEAR 641-#define CLIP_VM1_BOX_DISAPPEAR 642-#define CLIP_VM1_BOX_IDLE 643-#define CLIP_VM1_FRONT 644-#define CLIP_VM1_GRATE_DISAPPEAR 645-#define CLIP_VM1_GRATE_IDLE 646-#define CLIP_VM2_IDLE 647-#define CLIP_VM2_TALK 648-#define CLIP_VM2_TALK_END 649-#define CLIP_VM4_IDLE 650-#define CLIP_VM4_TALK_L 651-#define CLIP_VM4_TALK_L_END 652-#define CLIP_VM4_TALK_R 653-#define CLIP_VM4_TALK_R_END 654-#define CLIP_VM6_CRY 655-#define CLIP_VM6_CRY_TURN 656-#define CLIP_VM6_FREED 657-#define CLIP_VM6_IDLE 658-#define CLIP_VM7_STAND 659-#define CLIP_VM7_TURN_L 660-#define CLIP_VM7_TURN_R 661-#define CLIP_ANIM0_GROUND_PLINK_0 662-#define SPRITE_HERO_LIGHT 2803-#define SPRITE_DIALOGUE_BACKBOARD 2804-#define SPRITE_PROMPT_SHADOW 2805-#define SPRITE_CORPSE_NAIL 2806-#define SPRITE_FK_BARREL 2807-#define SPRITE_FK_STAFF 2808-#define SPRITE_DIGIT0 3130+#define CLIP_FX_ENEMY_SHOT 592+#define CLIP_FX_IMPACT_LINES 593+#define CLIP_FX_SLAM_FAST 594+#define CLIP_FX_SPLAT 595+#define CLIP_FX_SPLAT2 596+#define CLIP_FX_SWORD 597+#define CLIP_FIREBALL_BLAST 598+#define CLIP_FIREBALL_BALL 599+#define CLIP_FIREBALL_BALL_END 600+#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 601+#define CLIP_DRIP_IDLE 602+#define CLIP_DRIP_DRIP 603+#define CLIP_DRIP_FALL 604+#define CLIP_DRIP_IMPACT 605+#define CLIP_HORNETCS_IDLE 606+#define CLIP_HORNETCS_JUMP_FULL 607+#define CLIP_HORNETCS_THROW_SIDE_START 608+#define CLIP_HORNETCS_THROW_SIDE 609+#define CLIP_HORNETCS_HARPOON_SIDE 610+#define CLIP_HORNETCS_THREAD_1 611+#define CLIP_HORNETCS_POINT 612+#define CLIP_HORNETCS_EVADE_ANTIC 613+#define CLIP_HORNETCS_EVADE 614+#define CLIP_HORNETCS_SOFT_LAND 615+#define CLIP_HORNETCS_TURN 616+#define CLIP_HORNETCS_RUN 617+#define CLIP_BULLET_IDLE 618+#define CLIP_BULLET_IMPACT 619+#define CLIP_BULLET_SHOCKWAVE_SPURT 620+#define CLIP_SHROOM_IDLE_1 621+#define CLIP_SHROOM_BOB_1 622+#define CLIP_SHROOM_BOUNCE_1 623+#define CLIP_SHROOM_IDLE_2 624+#define CLIP_SHROOM_BOB_2 625+#define CLIP_SHROOM_BOUNCE_2 626+#define CLIP_SHROOM_BOUNCE_EFFECT 627+#define CLIP_GLOB_IDLE 628+#define CLIP_GLOB_LAND 629+#define CLIP_PROP0_DOOR_CLOSED 630+#define CLIP_PROP0_DOOR_OPEN_1 631+#define CLIP_PROP0_DOOR_OPEN_2 632+#define CLIP_PROP0_FLOOR_EXTEND 633+#define CLIP_PROP0_FLOOR_IDLE 634+#define CLIP_PROP0_FLOOR_RETRACT 635+#define CLIP_PROP0_GATE_CLOSE 636+#define CLIP_PROP0_GATE_IDLE 637+#define CLIP_PROP0_GATE_OPEN 638+#define CLIP_PROP0_IDLE 639+#define CLIP_PROP0_LEVER_ACTIVATED 640+#define CLIP_PROP0_LEVER_HIT 641+#define CLIP_PROP0_LEVER_IDLE 642+#define CLIP_PROP0_LEVER_UNHIT 643+#define CLIP_VM0_ARRIVE 644+#define CLIP_VM0_ARRIVE_SMOKE 645+#define CLIP_VM0_IDLE 646+#define CLIP_VM1_BELL_IDLE 647+#define CLIP_VM1_BELL_RING_R 648+#define CLIP_VM1_BELL_STAND 649+#define CLIP_VM1_BELL_STAND_APPEAR 650+#define CLIP_VM1_BOX_DISAPPEAR 651+#define CLIP_VM1_BOX_IDLE 652+#define CLIP_VM1_FRONT 653+#define CLIP_VM1_GRATE_DISAPPEAR 654+#define CLIP_VM1_GRATE_IDLE 655+#define CLIP_VM2_IDLE 656+#define CLIP_VM2_TALK 657+#define CLIP_VM2_TALK_END 658+#define CLIP_VM4_IDLE 659+#define CLIP_VM4_TALK_L 660+#define CLIP_VM4_TALK_L_END 661+#define CLIP_VM4_TALK_R 662+#define CLIP_VM4_TALK_R_END 663+#define CLIP_VM6_CRY 664+#define CLIP_VM6_CRY_TURN 665+#define CLIP_VM6_FREED 666+#define CLIP_VM6_IDLE 667+#define CLIP_VM7_STAND 668+#define CLIP_VM7_TURN_L 669+#define CLIP_VM7_TURN_R 670+#define CLIP_ANIM0_GROUND_PLINK_0 671+#define SPRITE_HERO_LIGHT 2827+#define SPRITE_DIALOGUE_BACKBOARD 2828+#define SPRITE_PROMPT_SHADOW 2829+#define SPRITE_CORPSE_NAIL 2830+#define SPRITE_FK_BARREL 2831+#define SPRITE_FK_STAFF 2832+#define SPRITE_DIGIT0 3186#define STYLE_DIALOGUE 0#define STYLE_PROMPT 1#define STYLE_TITLE_L 2@@ -982,14 +991,14 @@#define VMEV_MLORD_GATE_OPEN {255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 64, 255}#define VMEV_RETURN {255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 67, 255}#define VMSTR_NPC_TITLE 19-#define VMSTR_VISITED 223-#define VMSTR_DISPLAY_RIGHT 317-#define VMSTR_HORNET_SAVER 318-#define VMSTR_ITEM 312-#define VMSTR_ARENA_ITEM 264-#define VMSTR_ARENA_ITEM_KEPT 266-#define VMSTR_MANTIS_LORD_THRONE_1 209-#define VMSTR_MANTIS_LORD_THRONE_3 298+#define VMSTR_VISITED 224+#define VMSTR_DISPLAY_RIGHT 319+#define VMSTR_HORNET_SAVER 320+#define VMSTR_ITEM 314+#define VMSTR_ARENA_ITEM 265+#define VMSTR_ARENA_ITEM_KEPT 267+#define VMSTR_MANTIS_LORD_THRONE_1 210+#define VMSTR_MANTIS_LORD_THRONE_3 300#define STR_ATTACK_RANGE 15#define STR_EVADE_RANGE 37#define STR_SPIT_RANGE 38@@ -1033,37 +1042,37 @@#define TITLE_MANTIS_LORDS 26#define NUM_TITLES 27#define TITLE_TABLE {{55, 56, -1, -1}, {57, 58, 59, -1}, {60, 61, -1, 62}, {63, 64, -1, 65}, {66, 67, -1, 68}, {69, 70, -1, -1}, {71, 72, 73, -1}, {74, 75, -1, -1}, {76, 77, -1, -1}, {78, 79, -1, -1}, {80, 81, -1, -1}, {82, 83, -1, -1}, {84, 85, -1, -1}, {86, 87, -1, -1}, {88, 89, -1, 90}, {91, 92, -1, 93}, {91, 92, -1, 94}, {95, 96, 97, -1}, {95, 96, -1, -1}, {98, 99, -1, 100}, {101, 102, -1, 103}, {104, 105, -1, 106}, {107, 108, -1, 109}, {110, 111, -1, 103}, {112, 113, -1, -1}, {114, 115, 116, -1}, {117, 118, -1, 109}}-#define SPRITE_FLEUR_TOP 2809+#define SPRITE_FLEUR_TOP 2833#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 2810+#define SPRITE_FLEUR_BOT 2834#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 VM_PIECE_BASE 2799-#define SPRITE_MSG_BG 2811-#define SPRITE_MSG_STOP 2812-#define SPRITE_MSG_FLEUR 2813-#define SPRITE_MSG_KEY 2814-#define SPRITE_MSG_ICON_FIREBALL 2815-#define SPRITE_MSG_ICON_DASH 2816-#define SPRITE_MSG_ICON_WALLJUMP 2817-#define SPRITE_GRASS_BALL 2818-#define SPRITE_GAS 2819-#define SPRITE_GAS_FLASH 2820-#define SPRITE_SOUL_ORB 2821+#define VM_PIECE_BASE 2823+#define SPRITE_MSG_BG 2835+#define SPRITE_MSG_STOP 2836+#define SPRITE_MSG_FLEUR 2837+#define SPRITE_MSG_KEY 2838+#define SPRITE_MSG_ICON_FIREBALL 2839+#define SPRITE_MSG_ICON_DASH 2840+#define SPRITE_MSG_ICON_WALLJUMP 2841+#define SPRITE_GRASS_BALL 2842+#define SPRITE_GAS 2843+#define SPRITE_GAS_FLASH 2844+#define SPRITE_SOUL_ORB 2845#define SOUL_ORB_SORT {13, 0}#define MSG_TABLE {{119, 120, 121, 122, 123, 124}, {125, 126, 127, 128, 129, 130}, {131, 126, 127, 132, 133, 134}}-#define NOTICE_BACKBOARD {2822, 1.0000f, 0.6931f}-#define TUTE_FLEUR {2813, 1.0000f, 1.0000f}-#define TUTE_BACKBOARD {2823, 1.0000f, 0.9560f}-#define TUTE_IMAGE {2824, 1.0000f, 1.0000f}-#define TUTE_STOP {2812, 1.0000f, 1.0000f}-#define FOCUS_PROMPT_BG {2825, 0.0000f, -1.7900f, 1.0000f, 1.0000f}+#define NOTICE_BACKBOARD {2846, 1.0000f, 0.6931f}+#define TUTE_FLEUR {2837, 1.0000f, 1.0000f}+#define TUTE_BACKBOARD {2847, 1.0000f, 0.9560f}+#define TUTE_IMAGE {2848, 1.0000f, 1.0000f}+#define TUTE_STOP {2836, 1.0000f, 1.0000f}+#define FOCUS_PROMPT_BG {2849, 0.0000f, -1.7900f, 1.0000f, 1.0000f}#define FOCUS_PROMPT_TEXTS {{135, 0.1765f, -2.3773f, 0}, {136, 0.1765f, -3.1983f, 0}, {137, -0.0488f, -4.1348f, 1}, {138, 0.2240f, -5.2114f, 0}}#define FOCUS_PROMPT_KEY {124, 0.4659f, -4.4341f}-#define NOTICE_ICONS {2826, 2827, 2828}+#define NOTICE_ICONS {2850, 2851, 2852}#define CHARM_ICON_K 1.5000f-#define CHARM_ICONS {-1, 2829, 2830, 2831, 2832, -1, 2833, 2834, 2835, -1, -1, -1, -1, 2836, 2837, -1, -1, -1, 2838, 2839, 2840, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CHARM_ICONS {-1, 2853, 2854, 2855, 2856, -1, 2857, 2858, 2859, -1, -1, -1, -1, 2860, 2861, -1, -1, -1, 2862, 2863, 2864, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}#define CHARM_NAMES {-1, 139, 140, 141, 142, -1, 143, 144, 145, -1, -1, -1, -1, 146, 147, -1, -1, -1, 148, 149, 150, -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 151#define TXT_CHARM_TUTE_SUB 152@@ -1071,38 +1080,38 @@#define TXT_YN_YES 154#define TXT_YN_NO 155#define TXT_YN_NOT_ENOUGH 156-#define MENU_LOGO {2841, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_LOGO {2865, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_LOGO_Y 3.6585f#define MENU_START_Y -1.4181f#define MENU_HELP_Y -2.3582f#define MENU_QUIT_Y -3.2982f-#define MENU_POINTER {2842, 0.0000f, 0.0000f, 1.0023f, 1.0000f}+#define MENU_POINTER {2866, 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 {2843, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_PROFILES_FLEUR {2867, 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, {2844, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2845, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2846, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2847, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {9, {2848, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2849, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {24, {2850, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {35, {2851, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}+#define MENU_SLOT_ZONES {{2, {2868, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2869, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2870, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2871, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {9, {2872, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2873, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {24, {2874, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {35, {2875, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}#define MENU_SLOT_NZONES 8#define MENU_SLOT_BG_DY 0.0102f-#define MENU_SLOT_FLEUR {2852, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_FLEUR {2876, 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 {2853, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_SELECTOR {2877, 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 {2854, 0.0000f, 0.0000f, 1.0000f, 1.0025f}+#define MENU_SLOT_CURSOR {2878, 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 {2855, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_ORB {2879, 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 {2856, 0.0000f, 0.0000f, 1.0039f, 1.0000f}+#define MENU_SLOT_GEO {2880, 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 {2857, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_HEALTH {2881, 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@@ -1120,15 +1129,15 @@#define MENU_SLOT_YES_X 2.5813f#define MENU_SLOT_NO_X 6.2296f#define MENU_BACK_Y -5.5406f-#define MENU_PAUSE_TOP {2858, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_TOP {2882, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_TOP_Y 2.3653f-#define MENU_PAUSE_BOT {2859, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_BOT {2883, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_BOT_Y -1.8877f#define MENU_PAUSE_CONTINUE_Y 1.1916f#define MENU_PAUSE_HELP_Y 0.0940f#define MENU_PAUSE_QUIT_Y -1.0035f#define MENU_KEYS_TITLE_Y 5.7763f-#define MENU_KEYS_FLEUR {2843, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_KEYS_FLEUR {2867, 0.0000f, 0.0000f, 1.0000f, 1.0807f}#define MENU_KEYS_FLEUR_Y 4.7346f#define MENU_KEYS_ROW_Y 3.1809f#define MENU_KEYS_DY -1.0162f@@ -1161,39 +1170,39 @@#define TXT_CROSS_NEW 209#define INV_X -4.0500f#define INV_Y 7.5500f-#define INV_BORDER {{2860, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2860, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2861, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2862, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2863, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2864, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}+#define INV_BORDER {{2884, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2884, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2885, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2886, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2887, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2888, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}#define INV_NBORDER 6-#define INV_FRAME {2865, 4.0479f, -7.1963f, 1.0f, 1.0f}-#define INV_ARROW_L {2866, -9.8300f, -7.2000f, 1.0000f, 1.0000f}-#define INV_ARROW_R {2866, 18.0300f, -7.2000f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_L {2867, -9.8600f, -0.4300f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_R {2867, 18.0400f, -0.4300f, 1.0000f, 1.0000f}+#define INV_FRAME {2889, 4.0479f, -7.1963f, 1.0f, 1.0f}+#define INV_ARROW_L {2890, -9.8300f, -7.2000f, 1.0000f, 1.0000f}+#define INV_ARROW_R {2890, 18.0300f, -7.2000f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_L {2891, -9.8600f, -0.4300f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_R {2891, 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 {212, 213, 214, 215}-#define CH_BB {2868, -7.9200f, -8.3700f, 1.0000f, 1.0000f}+#define CH_BB {2892, -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 {2869, 0.0500f, 0.0600f, 1.0000f, 0.9919f}+#define CH_GLOW {2893, 0.0500f, 0.0600f, 1.0000f, 0.9919f}#define CH_GLOW_A 0.6970f-#define CH_ICONS {-1, 2829, 2830, 2831, 2832, -1, 2833, 2834, 2835, -1, -1, -1, -1, 2836, 2837, -1, -1, -1, 2838, 2839, 2840, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define CH_NEXT_DOT {2870, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_ICONS {-1, 2853, 2854, 2855, 2856, -1, 2857, 2858, 2859, -1, -1, -1, -1, 2860, 2861, -1, -1, -1, 2862, 2863, 2864, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CH_NEXT_DOT {2894, 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 {2871, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define CH_NOTCH_EMPTY {2872, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_FULL {2895, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_EMPTY {2896, 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 {2873, -0.8400f, -6.9300f, 1.0000f, 0.1591f}+#define CH_DIVIDER {2897, -0.8400f, -6.9300f, 1.0000f, 0.1591f}#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}-#define CH_COST_PIP {2871, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_COST_PIP {2895, 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@@ -1202,9 +1211,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 {2874, 16.3208f, -13.2878f, 1.0f, 1.0f}+#define CH_CONFIRM_KEY {2898, 16.3208f, -13.2878f, 1.0f, 1.0f}#define CH_CONFIRM_KEY_W 0.6412f-#define CH_CURSOR {2875, 0.0000f, 0.0000f, 1.0000f, 0.9756f}+#define CH_CURSOR {2899, 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 216@@ -1219,23 +1228,23 @@#define TXT_CHARM_DESCS {-1, 236, 237, 238, 239, -1, 240, 241, 242, -1, -1, -1, -1, 243, 244, -1, -1, -1, 245, 246, 247, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}#define TXT_KEY_OK 248#define TXT_CHARM_BENCH 249-#define INV_FIXED {{2876, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2877, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2878, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2879, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2880, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2881, -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}, {2882, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2883, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}+#define INV_FIXED {{2900, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2901, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2902, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2903, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2904, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2905, -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}, {2906, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2907, -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 {{2884, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2885, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2886, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2887, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}-#define INV_VESSEL_PIECES {{2888, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2889, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2890, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}+#define INV_HEART_PIECES {{2908, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2909, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2910, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2911, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}+#define INV_VESSEL_PIECES {{2912, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2913, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2914, -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 {{2891, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2892, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2893, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2894, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2895, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2896, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2897, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}+#define INV_EQ {{2915, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2916, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2917, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2918, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2919, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2920, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2921, 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}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}}-#define INV_TRINKETS {{2898, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2899, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2900, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2901, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}+#define INV_TRINKETS {{2922, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2923, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2924, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2925, 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 {2902, 4.2400f, -10.8700f, 1.0000f, 1.0000f}-#define INV_DIVIDERS {{2903, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2903, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}+#define INV_TRINKET_BB {2926, 4.2400f, -10.8700f, 1.0000f, 1.0000f}+#define INV_DIVIDERS {{2927, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2927, 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 {{250, 251}, {252, 253}, {254, 255}, {252, 256}, {252, 257}, {258, 259}}@@ -1244,15 +1253,15 @@#define TXT_INV_EQ {{275, 276}, {277, 278}, {279, 280}, {281, 282}, {283, 284}, {285, 286}, {287, 288}}#define TXT_INV_QUILL {289, 290, 291, 292}#define TXT_INV_TRINKETS {{293, 294}, {295, 296}, {297, 298}, {299, 300}}-#define SHOP_BACKBOARD {2904, 4.9000f, -0.3200f, 0.8667f, 1.0000f}-#define SHOP_MASK_TOP {2905, 5.1230f, 4.8800f, 1.0000f, 0.9013f}-#define SHOP_MASK_BOTTOM {2906, 5.1537f, -5.6200f, 1.0000f, 0.8820f}-#define SHOP_ARROW_U {2907, 1.7000f, 1.8900f, 1.0000f, 1.0000f}-#define SHOP_ARROW_D {2907, 1.7000f, -0.3800f, -1.0000f, 1.0000f}-#define SHOP_SELECTOR {2908, 1.7300f, 0.7600f, 0.9332f, 1.0000f}-#define SHOP_CONFIRM_GEO {2909, 4.2800f, 0.3400f, 1.0000f, 1.0000f}-#define SHOP_POINTER_L {2910, 3.6119f, -2.0798f, 1.0000f, 1.0000f}-#define SHOP_POINTER_R {2910, 6.6249f, -2.0798f, -1.0000f, 1.0000f}+#define SHOP_BACKBOARD {2928, 4.9000f, -0.3200f, 0.8667f, 1.0000f}+#define SHOP_MASK_TOP {2929, 5.1230f, 4.8800f, 1.0000f, 0.9013f}+#define SHOP_MASK_BOTTOM {2930, 5.1537f, -5.6200f, 1.0000f, 0.8820f}+#define SHOP_ARROW_U {2931, 1.7000f, 1.8900f, 1.0000f, 1.0000f}+#define SHOP_ARROW_D {2931, 1.7000f, -0.3800f, -1.0000f, 1.0000f}+#define SHOP_SELECTOR {2932, 1.7300f, 0.7600f, 0.9332f, 1.0000f}+#define SHOP_CONFIRM_GEO {2933, 4.2800f, 0.3400f, 1.0000f, 1.0000f}+#define SHOP_POINTER_L {2934, 3.6119f, -2.0798f, 1.0000f, 1.0000f}+#define SHOP_POINTER_R {2934, 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 302@@ -1272,7 +1281,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 {2911, 5.5100f, 2.5800f, 1.0000f, 1.0000f}+#define SHOP_PEG {2935, 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}@@ -1293,9 +1302,9 @@#define TXT_SHOP_YES 312#define TXT_SHOP_NO 313#define SHOP_DESC_BOTTOM -5.0500f-#define SHOP_ITEMS {{2913, 0.5714f, 314, 315, 150, 1, 125, -1, 0, 0}, {2913, 0.5714f, 314, 316, 500, 1, 126, 125, 0, 0}, {2914, 0.5714f, 317, 318, 550, 3, 127, -1, 0, 0}, {2915, 0.5714f, 319, 320, 950, 10, 128, -1, 0, 0}, {2916, 0.5714f, 321, 322, 300, 2, 37, -1, 0, 1}, {2917, 0.5714f, 323, 324, 200, 2, 40, -1, 0, 4}, {2918, 0.5714f, 325, 326, 1800, 0, 119, -1, 0, 0}, {2919, 0.5714f, 327, 328, 60, 11, 129, -1, 0, 0}, {2920, 0.5714f, 329, 330, 220, 2, 38, -1, 0, 2}, {2921, 0.5714f, 331, 332, 120, 0, 2, -1, 0, 0}, {2922, 0.5714f, 333, 334, 40, 9, 130, 10, 0, 0}, {2922, 0.5714f, 335, 336, 80, 9, 131, 28, 0, 0}, {2922, 0.5714f, 337, 338, 100, 9, 178, 180, 0, 0}, {2923, 0.5714f, 339, 340, 100, 16, 133, -1, 0, 0}, {2924, 0.5714f, 341, 342, 100, 16, 134, -1, 0, 0}, {2925, 0.5714f, 343, 344, 100, 16, 135, -1, 0, 0}, {2926, 0.5714f, 345, 346, 100, 16, 137, 147, 0, 0}, {2927, 0.5714f, 347, 348, 100, 16, 136, -1, 0, 0}, {2928, 0.5714f, 349, 350, 100, 17, 139, -1, 0, 0}, {2929, 0.5714f, 351, 352, 100, 17, 140, -1, 0, 0}, {2930, 0.5714f, 353, 354, 100, 17, 141, 14, 0, 0}, {2931, 0.5714f, 355, 356, 210, 17, 142, 14, 0, 0}, {2932, 0.5714f, 357, 358, 250, 2, 44, -1, 0, 8}, {2933, 0.5714f, 359, 360, 300, 2, 54, -1, 0, 18}, {2934, 0.5714f, 361, 362, 120, 2, 50, -1, 0, 14}, {2935, 0.5714f, 363, 364, 220, 2, 55, -1, 0, 19}, {2936, 0.5714f, 365, 366, 800, 2, 43, -1, 0, 7}, {2937, 0.5714f, 367, 368, 120, 8, 143, -1, 5, 0}, {2937, 0.5714f, 367, 368, 500, 8, 144, -1, 10, 0}, {2937, 0.5714f, 367, 368, 900, 8, 145, -1, 18, 0}, {2937, 0.5714f, 367, 369, 1400, 8, 146, -1, 25, 0}}+#define SHOP_ITEMS {{2937, 0.5714f, 314, 315, 150, 1, 125, -1, 0, 0}, {2937, 0.5714f, 314, 316, 500, 1, 126, 125, 0, 0}, {2938, 0.5714f, 317, 318, 550, 3, 127, -1, 0, 0}, {2939, 0.5714f, 319, 320, 950, 10, 128, -1, 0, 0}, {2940, 0.5714f, 321, 322, 300, 2, 37, -1, 0, 1}, {2941, 0.5714f, 323, 324, 200, 2, 40, -1, 0, 4}, {2942, 0.5714f, 325, 326, 1800, 0, 119, -1, 0, 0}, {2943, 0.5714f, 327, 328, 60, 11, 129, -1, 0, 0}, {2944, 0.5714f, 329, 330, 220, 2, 38, -1, 0, 2}, {2945, 0.5714f, 331, 332, 120, 0, 2, -1, 0, 0}, {2946, 0.5714f, 333, 334, 40, 9, 130, 10, 0, 0}, {2946, 0.5714f, 335, 336, 80, 9, 131, 28, 0, 0}, {2946, 0.5714f, 337, 338, 100, 9, 178, 180, 0, 0}, {2947, 0.5714f, 339, 340, 100, 16, 133, -1, 0, 0}, {2948, 0.5714f, 341, 342, 100, 16, 134, -1, 0, 0}, {2949, 0.5714f, 343, 344, 100, 16, 135, -1, 0, 0}, {2950, 0.5714f, 345, 346, 100, 16, 137, 147, 0, 0}, {2951, 0.5714f, 347, 348, 100, 16, 136, -1, 0, 0}, {2952, 0.5714f, 349, 350, 100, 17, 139, -1, 0, 0}, {2953, 0.5714f, 351, 352, 100, 17, 140, -1, 0, 0}, {2954, 0.5714f, 353, 354, 100, 17, 141, 14, 0, 0}, {2955, 0.5714f, 355, 356, 210, 17, 142, 14, 0, 0}, {2956, 0.5714f, 357, 358, 250, 2, 44, -1, 0, 8}, {2957, 0.5714f, 359, 360, 300, 2, 54, -1, 0, 18}, {2958, 0.5714f, 361, 362, 120, 2, 50, -1, 0, 14}, {2959, 0.5714f, 363, 364, 220, 2, 55, -1, 0, 19}, {2960, 0.5714f, 365, 366, 800, 2, 43, -1, 0, 7}, {2961, 0.5714f, 367, 368, 120, 8, 143, -1, 5, 0}, {2961, 0.5714f, 367, 368, 500, 8, 144, -1, 10, 0}, {2961, 0.5714f, 367, 368, 900, 8, 145, -1, 18, 0}, {2961, 0.5714f, 367, 369, 1400, 8, 146, -1, 25, 0}}#define SHOP_FIRST {0, 8, 22, 31}-#define SHOP_ROW_GEO {2912, 1.4551f, 0.0000f, 1.0000f, 1.0000f}+#define SHOP_ROW_GEO {2936, 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}@@ -1311,21 +1320,21 @@#define STAG_N 4#define STAG_AT {0.3000f, 0.3000f}#define STAG_K 1.2646f-#define STAG_BACKING {2938, -0.4427f, 0.0000f, 1.0000f, 0.6408f}+#define STAG_BACKING {2962, -0.4427f, 0.0000f, 1.0000f, 0.6408f}#define STAG_BACKING_A 0.9020f-#define STAG_PIECES {{2939, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2940, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2941, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {2942, 0.4147f, 1.5909f, 1.0000f, 1.0000f}, {2943, 3.2899f, -0.9763f, 1.0000f, 1.0000f}}+#define STAG_PIECES {{2963, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2964, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2965, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {2966, 0.4147f, 1.5909f, 1.0000f, 1.0000f}, {2967, 3.2899f, -0.9763f, 1.0000f, 1.0000f}}#define STAG_OPENED {-1, 155, 156, 171}#define STAG_MARKS {{2.9379f, 3.7471f}, {4.8742f, 2.0690f}, {-0.4360f, 2.7790f}, {3.5687f, -0.9763f}}#define STAG_SELECTOR {0.0000f, 0.0000f, 1.1797f, 1.2092f}-#define STAG_MAP_KNIGHT {2944, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define STAG_MAP_SHADOW {2945, 0.0110f, -0.0100f, 1.0000f, 0.9227f}+#define STAG_MAP_KNIGHT {2968, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define STAG_MAP_SHADOW {2969, 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 {2946, 2.8680f, 0.6180f, -1.0000f, 1.0000f}-#define STAG_POINTER_L {2946, -2.8680f, 0.6180f, 1.0000f, 1.0000f}+#define STAG_POINTER_R {2970, 2.8680f, 0.6180f, -1.0000f, 1.0000f}+#define STAG_POINTER_L {2970, -2.8680f, 0.6180f, 1.0000f, 1.0000f}#define STAG_ROW {-7.5992f, 3.9576f}-#define STAG_LIST_KNIGHT {2944, -10.5102f, 4.6056f, 1.0000f, 1.0000f}-#define STAG_DIVIDER {2947, -7.6003f, 5.2734f, -1.0000f, -0.8696f}+#define STAG_LIST_KNIGHT {2968, -10.5102f, 4.6056f, 1.0000f, 1.0000f}+#define STAG_DIVIDER {2971, -7.6003f, 5.2734f, -1.0000f, -0.8696f}#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}#define TXT_STAG_STATIONS 374#define TXT_STAG_NAMES {375, 333, 335, 376}@@ -1340,52 +1349,54 @@#define TXT_STAG_CTRL_CANCEL 308#define STAG_SCENES_STR {42, 41, 43, 44}#define STAG_SCENES_ROOM {32772, 32787, 32804, 6}-#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 381, 0x0u}, {2, 18, 130, -0.0400f, -7.8800f, 382, 0x20u}, {20, 12, 131, 16.3100f, -7.8700f, 384, 0x0u}}-#define MAP_ROOMS {{0, 255, 2948, 2949, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 255, 2955, 2956, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 127, 2958, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 2959, 2960, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 255, 2961, 2962, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 255, 2963, 2964, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 255, 2965, 2966, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 255, 2967, 2968, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2969, 2970, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 38, 2971, -1, -2.2000f, 3.7130f, 0.6600f, 0.7900f, 0xB5DDFB, 0}, {1, 255, 2972, 2973, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 255, 2974, 2975, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 2976, 2977, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2978, 2979, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2980, 2981, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 255, 2982, 2983, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 255, 2984, 2985, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 255, 2986, 2987, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 255, 2988, 2989, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2990, 2991, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 2992, 2993, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 255, 2994, 2995, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 255, 2996, 2997, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 2998, 2999, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 255, 3000, 3001, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3002, 3003, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 255, 3004, 3005, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3006, 3007, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 255, 3008, 3009, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 255, 3010, 3011, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 255, 3012, 3013, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 255, 3014, 3015, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}-#define MAP_PINS {{0, 0, 2950, -2.0390f, 7.7500f, 133, -1}, {0, 0, 2951, -1.6430f, 7.7500f, 137, -1}, {0, 0, 2952, -2.4700f, 7.7500f, 135, 122}, {0, 0, 2953, -1.2540f, 7.7600f, 135, 123}, {1, 1, 2957, -6.2100f, 7.6800f, 134, -1}, {21, 1, 2957, -10.9970f, 6.6240f, 134, -1}, {22, 0, 2950, -11.2580f, 4.9690f, 133, -1}, {30, 0, 2950, -7.6610f, 6.0700f, 133, -1}}-#define MAP_NEXT {{0, 2954, -1.0730f, 6.4850f, 180.0000f, 380, -1.0730f, 6.1870f, 1, -1}, {19, 2954, -1.0730f, 7.2500f, 0.0000f, 379, -1.0930f, 7.9120f, 1, -1}, {31, 2954, -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}, {2, -1, 383, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}+#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 381, 0x0u}, {2, 18, 130, -0.0400f, -7.8800f, 382, 0x20u}, {20, 12, 131, 16.3100f, -7.8700f, 384, 0x0u}, {32, 18, 178, 5.0500f, 0.4700f, 389, 0x1000200u}}+#define MAP_ROOMS {{0, 255, 2972, 2973, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 255, 2979, 2980, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 127, 2982, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 2983, 2984, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 255, 2985, 2986, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 255, 2987, 2988, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 255, 2989, 2990, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 255, 2991, 2992, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2993, 2994, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 38, 2995, -1, -2.2000f, 3.7130f, 0.6600f, 0.7900f, 0xB5DDFB, 0}, {1, 255, 2996, 2997, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 255, 2998, 2999, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3000, 3001, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3002, 3003, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3004, 3005, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 255, 3006, 3007, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 255, 3008, 3009, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 255, 3010, 3011, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 255, 3012, 3013, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 3014, 3015, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 3016, 3017, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 255, 3018, 3019, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 255, 3020, 3021, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 3022, 3023, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 255, 3024, 3025, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3026, 3027, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 255, 3028, 3029, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3030, 3031, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 255, 3032, 3033, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 255, 3034, 3035, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 255, 3036, 3037, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 255, 3038, 3039, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}, {3, 51, 3040, -1, -2.3360f, -3.6010f, 1.1000f, 0.5200f, 0xBDC188, 0}, {3, 255, 3041, 3042, -0.6840f, -0.5550f, 2.3900f, 1.0600f, 0xF9FFD2, 1}, {3, 45, 3043, 3044, -4.3410f, -1.1440f, 2.5800f, 1.0800f, 0xF9FFD2, 1}, {3, 50, 3045, -1, -3.3900f, -4.2080f, 1.1900f, 1.9100f, 0xBDC188, 0}, {3, 49, 3046, -1, -2.8160f, -2.9300f, 2.9000f, 0.7100f, 0xBDC188, 0}, {3, 48, 3047, -1, -1.0260f, -3.2110f, 0.6800f, 1.8300f, 0xBDC188, 0}, {3, 47, 3048, -1, -1.2290f, -2.0440f, 2.6600f, 0.5100f, 0xBEC188, 0}, {3, 46, 3049, 3050, -2.8140f, -1.6970f, 0.5300f, 1.1900f, 0xF9FFD2, 1}, {3, 255, 3051, 3052, -2.4560f, -0.5060f, 1.2400f, 1.2500f, 0xF9FFD2, 1}, {3, 255, 3053, 3054, -1.3060f, -0.0810f, 1.1100f, 0.3900f, 0xF9FFD2, 1}, {3, 255, 3055, 3056, -0.4470f, 0.3790f, 0.6100f, 1.1400f, 0xF9FFD2, 1}, {3, 255, 3057, 3058, -1.3130f, 0.7660f, 1.1100f, 0.4900f, 0xF9FFD2, 1}, {3, 39, 3059, 3060, -2.2130f, 2.0000f, 0.6868f, 2.6900f, 0xF9FFD2, 1}, {3, 40, 3062, 3063, -3.0650f, 0.9050f, 1.0100f, 0.5463f, 0xF9FFD2, 1}, {3, 41, 3064, 3065, -3.6020f, 0.0250f, 0.6000f, 1.2400f, 0xF9FFD2, 1}, {3, 42, 3066, 3067, -4.8310f, -0.0300f, 1.9400f, 1.2300f, 0xF9FFD2, 1}, {3, 44, 3068, -1, -7.2030f, -0.9950f, 0.6600f, 0.3000f, 0xFFFFFF, 0}, {3, 43, 3069, 3070, -6.3330f, -0.6490f, 1.0908f, 0.9100f, 0xFFFFFF, 1}}+#define MAP_PINS {{0, 0, 2974, -2.0390f, 7.7500f, 133, -1}, {0, 0, 2975, -1.6430f, 7.7500f, 137, -1}, {0, 0, 2976, -2.4700f, 7.7500f, 135, 122}, {0, 0, 2977, -1.2540f, 7.7600f, 135, 123}, {1, 1, 2981, -6.2100f, 7.6800f, 134, -1}, {21, 1, 2981, -10.9970f, 6.6240f, 134, -1}, {22, 0, 2974, -11.2580f, 4.9690f, 133, -1}, {30, 0, 2974, -7.6610f, 6.0700f, 133, -1}, {32, 0, 2974, -2.0500f, -3.7200f, 133, -1}, {35, 1, 2981, -3.9100f, -4.5770f, 134, -1}, {37, 0, 2974, -0.8660f, -3.9710f, 133, -1}, {48, 0, 2974, -7.0630f, -0.9250f, 133, -1}, {48, 0, 2975, -7.4350f, -0.9250f, 137, -1}}+#define MAP_NEXT {{0, 2978, -1.0730f, 6.4850f, 180.0000f, 380, -1.0730f, 6.1870f, 1, -1}, {19, 2978, -1.0730f, 7.2500f, 0.0000f, 379, -1.0930f, 7.9120f, 1, -1}, {31, 2978, -4.5300f, 5.8450f, -90.0000f, 380, -4.1075f, 6.0470f, 0, 6}, {33, 2978, 0.8960f, -0.9550f, -90.0000f, 386, 1.3185f, -0.7530f, 0, 168}, {44, 3061, -1.4353f, 2.6929f, 0.0000f, 380, -1.5843f, 3.3615f, 0, -1}}+#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}, {2, -1, 383, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}, {3, -1, 385, 0.3207f, -1.1999f, 0xF8FFD2, 0, 1}, {3, 36, 387, 1.9460f, -2.6339f, 0xF8FFD2, 1, 0}, {3, 49, 388, 2.0089f, -1.1539f, 0xFFFFFF, 2, 0}}#define MAP_QUICK_K 1.5500f-#define MAP_SHADE {{3016, 0.0055f, -0.0110f, 178}, {3017, 0.0000f, 0.0000f, 255}}-#define MAP_MARKERS {3018, 3019, 3020, 3021}+#define MAP_SHADE {{3071, 0.0055f, -0.0110f, 178}, {3072, 0.0000f, 0.0000f, 255}}+#define MAP_MARKERS {3073, 3074, 3075, 3076}#define MAP_COMPASS_K 0.7000f#define MAP_BG_A 0.4438f#define MAP_TITLE {0.0000f, 7.5363f}-#define MAP_TITLE_BACK {3022, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}-#define MAP_NO_MAP {3023, 0.0000f, 0.9400f}-#define MAP_NO_MAP_MSG {385, -0.0600f, -1.2932f}-#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 386, 3024, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}+#define MAP_TITLE_BACK {3077, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}+#define MAP_NO_MAP {3078, 0.0000f, 0.9400f}+#define MAP_NO_MAP_MSG {390, -0.0600f, -1.2932f}+#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 391, 3079, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}#define MAP_MSG_K 0.7000f#define FIRSTMAP_BG_A 0.6410f-#define FIRSTMAP_TEXTS {{387, 0.0000f, 5.0305f}, {137, 0.0000f, -0.8796f}, {388, 0.0000f, -3.2895f}, {389, 0.0000f, -4.6996f}}-#define FIRSTMAP_PIECES {{3025, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3026, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3027, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}-#define FIRSTMAP_KEY {390, 0.0900f, -2.3200f}-#define MAP_WIDE {{{3028, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 391, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3029, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 392, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3030, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 393, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}}+#define FIRSTMAP_TEXTS {{392, 0.0000f, 5.0305f}, {137, 0.0000f, -0.8796f}, {393, 0.0000f, -3.2895f}, {394, 0.0000f, -4.6996f}}+#define FIRSTMAP_PIECES {{3080, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3081, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3082, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}+#define FIRSTMAP_KEY {395, 0.0900f, -2.3200f}+#define MAP_WIDE {{{3083, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 396, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3084, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 397, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3085, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 398, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}, {{3086, 2.3100f, -10.7600f, 1.0000f, 1.0000f}, 399, {8.1120f, -10.3825f, 11.0476f}, 4.5600f, 1.3100f, 3.1000f, -11.7600f, {1000.0000f, -1000.0000f, 1000.0000f, 4.1400f}}}#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_WIDE_POS_2_DX 0.2400f+#define MAP_WIDE_POS_2_DY 1.1700f#define MAP_PAN {-1.4400f, 4.5500f, -8.6420f, -5.5800f}#define MAP_PAN_SPEED 8.0000f-#define MAP_PAN_ARROWS {{3031, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3031, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3031, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3031, 17.1900f, -7.1700f, 1.0f, -90.0000f}}-#define MAP_ACT_CONFIRM {{3032, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {394, 395, 395}}-#define MAP_ACT_MARKER {{3032, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {396, 397, 398}}-#define MAP_ACT_CANCEL {{3032, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {308, 308, 308}}-#define MAP_ACT_CHANGE {{3032, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {399, 399, 399}}-#define MAP_ACT_KEY {{3032, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {400, 401, 402}}-#define MAP_KEY_BB {3033, 13.6200f, 3.4200f, 0.3781f, 1.0000f}+#define MAP_PAN_ARROWS {{3087, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3087, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3087, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3087, 17.1900f, -7.1700f, 1.0f, -90.0000f}}+#define MAP_ACT_CONFIRM {{3088, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {400, 401, 401}}+#define MAP_ACT_MARKER {{3088, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {402, 403, 404}}+#define MAP_ACT_CANCEL {{3088, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {308, 308, 308}}+#define MAP_ACT_CHANGE {{3088, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {405, 405, 405}}+#define MAP_ACT_KEY {{3088, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {406, 407, 408}}+#define MAP_KEY_BB {3089, 13.6200f, 3.4200f, 0.3781f, 1.0000f}#define MAP_KEY_STEP -0.8250f-#define MAP_KEY_ROWS {{{3034, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 403, {12.7550f, -1.5413f, 15.3500f}}, {{3035, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 404, {12.7550f, -1.5413f, 15.3500f}}, {{3036, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 405, {12.7550f, -1.5413f, 15.3500f}}, {{3037, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 406, {12.7550f, -1.5413f, 15.3500f}}, {{3038, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 407, {12.7550f, -1.5413f, 15.3500f}}}+#define MAP_KEY_ROWS {{{3090, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 409, {12.7550f, -1.5413f, 15.3500f}}, {{3091, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 410, {12.7550f, -1.5413f, 15.3500f}}, {{3092, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 411, {12.7550f, -1.5413f, 15.3500f}}, {{3093, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 412, {12.7550f, -1.5413f, 15.3500f}}, {{3094, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 413, {12.7550f, -1.5413f, 15.3500f}}}#define MAP_KEY_FLAGS {133, 134, 135, 136, 137}#define MAP_KEY_N 5-#define MAP_MM_PIECES {{3039, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3040, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3041, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3042, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}-#define MAP_MM_MARKERS {3043, 3044, 3045, 3046}+#define MAP_MM_PIECES {{3095, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3096, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3097, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3098, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}+#define MAP_MM_MARKERS {3099, 3100, 3101, 3102}#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 {3047, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}+#define MAP_MM_PLACE {3103, 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 408+#define TXT_KEY_SHIFT 414#define ROOM_ZONES {5, 9, 9, 9, 9, 24, 24, 9, 9, 9, 9, 9, 9, 9}#define MSG_FIREBALL 0#define MSG_DASH 1diff --git a/games/hollowknight/src/enemy_fw.c b/games/hollowknight/src/enemy_fw.cindex fa00aa40..97e9dccb 100644--- a/games/hollowknight/src/enemy_fw.c+++ b/games/hollowknight/src/enemy_fw.c@@ -415,6 +415,41 @@ static void globs_draw(void) {}}+/* (an Ogre's Spit Effect and Slam Effect: its children, a clip each time it spits or its smash lands, then off) */+#define MAX_OGRE_FX 4+static struct {+ bool on;+ float x, y, sx, sy;+ Anim anim;+} ogre_fx[MAX_OGRE_FX];++static void ogre_fx_play(const Enemy *e, int clip, float lx, float ly, float kx, float ky) {+ int k = 0;+ for (int i = 0; i < MAX_OGRE_FX; i++)+ if (!ogre_fx[i].on) k = i;+ enemy_at(e, lx, ly, &ogre_fx[k].x, &ogre_fx[k].y);+ ogre_fx[k].on = true, ogre_fx[k].sx = (e->sx < 0 ? -kx : kx), ogre_fx[k].sy = ky;+ anim_play_from_frame(&ogre_fx[k].anim, clip, 0);+}++static void ogre_fx_tick(void) {+ for (int i = 0; i < MAX_OGRE_FX; i++)+ if (ogre_fx[i].on) {+ ogre_fx[i].anim.events = 0;+ anim_update(&ogre_fx[i].anim, DT);+ if (ogre_fx[i].anim.events & ANIM_DONE) ogre_fx[i].on = false;+ }+}++static void ogre_fx_draw(void) {+ for (int i = 0; i < MAX_OGRE_FX; i++)+ if (ogre_fx[i].on && ogre_fx[i].anim.sprite >= 0) {+ Inst in;+ sprite_inst(ogre_fx[i].anim.sprite, ogre_fx[i].x, ogre_fx[i].y, -0.002f, ogre_fx[i].sx, ogre_fx[i].sy, 0, &in);+ gfx_actor(&in, SORT_KEY(0, 0));+ }+}+/* ---------------------------------------------------------------- Shrumal Ogres (Shroom Brawler): asleep till woken* (by their Wake Region, or by their arena), they roam about where they started, turning to face the Knight; every* second and a half or so they spit globs at him or, if he is near, smash the ground before them. Their cap blocks@@ -555,6 +590,7 @@ static void ogre_update(Enemy *e) {float x, y;enemy_at(e, v ? v->p0 : -1.95f, v ? v->p1 : 0.04f, &x, &y);for (int n = (int)rand_range(2, 4.999f); n > 0; n--) glob_fling(x, y, rand_range(t - 1.5f, t + 1.5f), rand_range(23, 26));+ ogre_fx_play(e, CLIP_FX_ENEMY_SHOT, -3.32f, 1.55f, 1.2826f, 1.4723f); /* (its Spit Effect: PLAY) */e->st = OG_SPIT;}break;@@ -578,11 +614,18 @@ static void ogre_update(Enemy *e) {mk_hitbox(e, STR_SMASH_HITS, true);anim_play_from_frame(&e->anim, CLIP(e, R_A4), 0);ogre_invincible(e, false);- e->wait = 2.25f;+ e->wait = 2.25f, e->c2 = 255, e->pause1 = 0;e->st = OG_SMASHING;}break;case OG_SMASHING:+ /* (Slam Effects: the smash's frame that lands (its sprite 36), its Slam Effect, then a shake a moment after) */+ if ((e->anim.frame == 3 || e->anim.frame == 11) && e->c2 != e->anim.frame) {+ ogre_fx_play(e, CLIP_FX_SLAM_FAST, -2.936f, -1.1009f, 1, 1);+ e->pause1 = 0.1f;+ }+ e->c2 = (uint8_t)e->anim.frame;+ if (e->pause1 > 0 && (e->pause1 -= DT) <= 0) cam_shake(SHAKE_ENEMY_KILL);if ((e->wait -= DT) <= 0 || e->b1 == hero_left) {/* Smash Recover */mk_hitbox(e, STR_SMASH_HITS, false);@@ -648,6 +691,7 @@ typedef struct {uint8_t st;float x, y, vx, vy, t, ang;Anim anim, lines;+ uint32_t hit; /* (its Gas Explosion's damages_enemy: the enemies it has hit, a bit each) */} Bomb;static Bomb bombs[MAX_BOMBS];@@ -678,6 +722,18 @@ static void bombs_tick(void) {anim_update(&b->anim, DT);if (b->st == BB_BOOM) {anim_update(&b->lines, DT);+ if (b->t < 0.5f)+ /* (its circle, while on, hits every enemy it meets once, hard: damages_enemy's 9999) */+ for (int k = 0; k < MAX_ENEMIES; k++) {+ Enemy *e = &en[k];+ if (e->mode != EM_ALIVE || (e->flags & 17) || (b->hit >> k & 1)) continue;+ float x0, y0, x1, y1;+ enemy_box(e, &x0, &y0, &x1, &y1);+ float qx = b->x < x0 ? x0 : b->x > x1 ? x1 : b->x, qy = b->y < y0 ? y0 : b->y > y1 ? y1 : b->y;+ if ((qx - b->x) * (qx - b->x) + (qy - b->y) * (qy - b->y) >= 9) continue;+ b->hit |= 1u << k;+ enemy_hit_by(e, atan2f(e->body.y - b->y, e->body.x - b->x) * 180 / (float)M_PI, 9999, false, 1);+ }if ((b->t += DT) >= 1.5f) b->st = BB_OFF; /* (Collider End: 1 s more, then Recycle) */continue;}@@ -1815,6 +1871,7 @@ static void xl_enter(void) {memset(bombs, 0, sizeof bombs);memset(lances, 0, sizeof lances);memset(&mlb, 0, sizeof mlb);+ memset(ogre_fx, 0, sizeof ogre_fx);}static void xl_tick(void) {gas_tick();@@ -1822,6 +1879,7 @@ static void xl_tick(void) {bombs_tick();lances_tick();mlb_tick();+ ogre_fx_tick();}static void xl_draw(void) {gas_draw();@@ -1829,6 +1887,7 @@ static void xl_draw(void) {bombs_draw();lances_draw();mlords_draw();+ ogre_fx_draw();}static int xl_touch(float x0, float y0, float x1, float y1, int *side) {int d = gas_touch(x0, y0, x1, y1, side);diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.hindex 256d2926..44bf02d1 100644--- a/games/hollowknight/src/game.h+++ b/games/hollowknight/src/game.h@@ -133,7 +133,7 @@ void save_set_respawn_kind(const char *marker, bool facing_right, int type); /enum { ENT_CAMLOCK = 1, ENT_GATE, ENT_HAZARD_MARKER, ENT_RESPAWN, ENT_HAZARD_TRIGGER, ENT_MASK, ENT_DAMAGE, ENT_SHAPE,ENT_BOX, ENT_OBJ, ENT_PIECE, ENT_SHADE_MARKER }; /* (shape, box, piece: more of the record before) */enum { OK_BREAKABLE = 1, OK_ENEMY, OK_GREAT_DOOR, OK_GEO_ROCK, OK_CHEST, OK_BENCH, OK_BATTLE, OK_FK_FLOOR, OK_BGATE,- OK_ARENA, OK_EVENT, OK_SUMMON, OK_COND, OK_PROP, OK_DRIP, OK_COCOON, OK_AREA }; /* objects (ENT_OBJ's flags) */+ OK_ARENA, OK_EVENT, OK_SUMMON, OK_COND, OK_PROP, OK_DRIP, OK_COCOON, OK_AREA, OK_SHROOM }; /* objects (ENT_OBJ's flags) *//* an enemy record's s1: starts alert (or first); startles; one of an arena's Pre Battle Enemies; its death counts for its arena; gone once its arena's* fight is over; spawned by its mother's burster; there only once its arena's fight is over; its FSMs off till near* the camera (FSMActivator); then its death's effects@@ -161,7 +161,8 @@ int enemies_wave_hp(int wave); /* (the HP of the first of them alive, else -1#endifvoid enemies_hornet_wake(void); /* WAKE (to Hornet) */void enemies_hornet_saver(bool on); /* her Hornet Saver's walls (ActivateAllChildren) */-enum { HB_BOUNCE = 1, HB_RECOIL = 2 }; /* a hit box (ENT_BOX's flags): a down slash bounces off it, a slash recoils */+enum { HB_BOUNCE = 1, HB_RECOIL = 2, HB_SHROOM = 4 }; /* a hit box (ENT_BOX's flags): a down slash bounces off it, a slash+ recoils; (obj_nail's) a bounce shroom */enum { HAZ_NONE, HAZ_NORMAL, HAZ_SPIKES, HAZ_ACID, HAZ_LAVA, HAZ_PIT }; /* DamageHero.hazardType */enum { MK_SECRET = 1, MK_REMASK = 2, MK_SIMPLE = 4 }; /* masks: the unmasker, remasker and inverse FSMs */enum { CL_PREVENT_UP = 1, CL_PREVENT_DOWN = 2, CL_MAX_PRIORITY = 4 };@@ -197,6 +198,9 @@ void obj_draw(void);void obj_keep_cocoons(void);void obj_swing_start(void); /* a slash's hit shape on: what it hits, once */int obj_nail(const float *pts, int npts, float direction); /* -> HB_* of what it touches */+#ifdef HK_FW+void shrooms_touched(int col); /* the Knight touched a collider: a bounce shroom's Phys Box? */+#endiffloat rand_range(float lo, float hi); /* Random.Range (floats) *//* enemies, their corpses, geo (enemy.c) */@@ -214,7 +218,11 @@ void body_bounce(Body *b, float pvx, float pvy, int had, float factor); /* Objvoid geo_fling_at(int type, int n, float x, float y, float smin, float smax, float amin, float amax, float spread);int cardinal(float degrees); /* DirectionUtils.GetCardinalDirection */const Ent *room_ents(int *n);+#ifdef HK_FW+#define MAX_ENTS 576 /* (Fungus2_18's bounce shrooms) */+#else#define MAX_ENTS 448+#endif/* ---------------------------------------------------------------- the game */typedef struct {@@ -266,7 +274,7 @@ typedef struct { /* HeroControllerStates */bool looking_up, looking_down, looking_up_anim, looking_down_anim, bouncing, recoiling_left, recoiling_right;bool recoiling, recoil_frozen, dead, hazard_death, hazard_respawning, will_hard_land, casting, cast_recoiling;bool prevent_dash, dash_cooldown, in_walk_zone, touching_wall, touching_non_slider, was_on_ground, transitioning;- bool invulnerable, focusing, wall_sliding;+ bool invulnerable, focusing, wall_sliding, shroom_bouncing;} CState;typedef struct {diff --git a/games/hollowknight/src/hero.c b/games/hollowknight/src/hero.cindex 73fea516..ca2c8af4 100644--- a/games/hollowknight/src/hero.c+++ b/games/hollowknight/src/hero.c@@ -20,6 +20,7 @@#define ATTACK_COOLDOWN_TIME 0.41f#define BOUNCE_TIME 0.25f#define BOUNCE_VELOCITY 12.0f+#define SHROOM_BOUNCE_VELOCITY 25.0f#define RECOIL_HOR_VELOCITY 3.75f#define RECOIL_HOR_VELOCITY_LONG 16.0f#define RECOIL_HOR_STEPS 8@@ -140,7 +141,7 @@ static void cancel_dash(void) {g_hero.cs.dashing = false, g_hero.dash_timer = 0;affected_by_gravity(true);}-static void cancel_bounce(void) { g_hero.cs.bouncing = false, g_hero.bounce_timer = 0; }+static void cancel_bounce(void) { g_hero.cs.bouncing = g_hero.cs.shroom_bouncing = false, g_hero.bounce_timer = 0; }static void cancel_recoil_horizontal(void) { g_hero.cs.recoiling_left = g_hero.cs.recoiling_right = false, g_hero.recoil_steps = 0; }static void cancel_wallsliding(void) {Hero *h = &g_hero;@@ -189,7 +190,7 @@ static void back_on_ground(void) {static void jump_released(void) {Hero *h = &g_hero;- if (h->body.vy > 0 && h->jumped_steps >= JUMP_STEPS_MIN) {+ if (h->body.vy > 0 && h->jumped_steps >= JUMP_STEPS_MIN && !h->cs.shroom_bouncing) {h->body.vy = 0;cancel_jump();}@@ -215,7 +216,7 @@ static void do_hard_landing(void) {static bool can_jump(void) {Hero *h = &g_hero;if (h->state == HS_NO_INPUT || h->state == HS_HARD_LANDING || h->state == HS_DASH_LANDING || h->cs.wall_sliding ||- h->cs.dashing || h->cs.jumping || h->cs.bouncing)+ h->cs.dashing || h->cs.jumping || h->cs.bouncing || h->cs.shroom_bouncing)return false;if (h->cs.on_ground) return true;if (h->ledge_buffer_steps > 0 && !h->cs.dead && !h->control_relinquished && h->head_bump_steps <= 0 && !check_near_roof()) {@@ -368,6 +369,18 @@ void hero_recoil_right(void) {h->body.vx = RECOIL_HOR_VELOCITY;}}+/* (off a bounce shroom: farther, and Steady Body does not hold the Knight) */+static void recoil_long(bool left) {+ Hero *h = &g_hero;+ if (!h->cs.recoiling_left && !h->cs.recoiling_right && !h->control_relinquished) {+ cancel_dash();+ reset_attacks();+ h->recoil_steps = 0;+ h->cs.recoiling_left = left, h->cs.recoiling_right = !left;+ h->recoil_large = true;+ h->body.vx = left ? -RECOIL_HOR_VELOCITY_LONG : RECOIL_HOR_VELOCITY_LONG;+ }+}void hero_recoil_down(void) {Hero *h = &g_hero;cancel_jump();@@ -375,7 +388,7 @@ void hero_recoil_down(void) {}void hero_bounce(void) {Hero *h = &g_hero;- if (!h->cs.bouncing && !h->control_relinquished) {+ if (!h->cs.bouncing && !h->cs.shroom_bouncing && !h->control_relinquished) {cancel_jump();cancel_dash();h->bounce_timer = 0;@@ -550,6 +563,9 @@ static bool should_hard_land(int col) {static void on_enter(const BodyEvent *e) {Hero *h = &g_hero;uint8_t f = phys_col_flags(e->col);+#ifdef HK_FW+ shrooms_touched(e->col); /* (a bounce shroom's Phys Box: its CollisionEnterEvent) */+#endifif ((f & CF_TERRAIN) && hero_touching_ground()) h->landed_event = true; /* HeroCtrl-Landed */if (h->state != HS_NO_INPUT) {if (!(f & CF_TERRAIN)) return;@@ -557,7 +573,7 @@ static void on_enter(const BodyEvent *e) {if (side == SIDE_TOP) {h->head_bump_steps = HEAD_BUMP_STEPS;if (h->cs.jumping) cancel_jump();- if (h->cs.bouncing) cancel_bounce(), h->body.vy = 0;+ if (h->cs.bouncing || h->cs.shroom_bouncing) cancel_bounce(), h->body.vy = 0;}if (side == SIDE_BOTTOM) {if (h->cs.attacking) cancel_down_attack();@@ -729,6 +745,7 @@ static void update(void) {if (h->bounce_timer < BOUNCE_TIME) h->bounce_timer += DT;else cancel_bounce(), h->body.vy = 0;}+ if (h->cs.shroom_bouncing && h->body.vy <= 0) h->cs.shroom_bouncing = false;if (h->state == HS_IDLE) {if (!h->control_relinquished && !g_game.paused) {if (held(K_UP)) {@@ -1097,6 +1114,17 @@ static void slash_hits(void) {float direction = sl.kind == SLASH_UP ? 90 : sl.kind == SLASH_DOWN ? 270 : (h->cs.facing_right != (sl.kind == SLASH_WALL)) ? 0 : 180;int fl = obj_nail(pts, 6, direction);if (direction == 270 && !(fl & HB_BOUNCE)) fl |= hazards_nail(pts, 6);+ if (fl & HB_SHROOM) {+ /* (a bounce shroom: far off it to the sides, down off it from below, high off it from above) */+ if (direction == 0) recoil_long(true);+ else if (direction == 180) recoil_long(false);+ else if (direction == 90) hero_recoil_down();+ else {+ h->air_dashed = false;+ h->cs.bouncing = false, h->cs.shroom_bouncing = true;+ h->body.vy = SHROOM_BOUNCE_VELOCITY;+ }+ }if (direction == 0 && (fl & HB_RECOIL)) hero_recoil_left();else if (direction == 180 && (fl & HB_RECOIL)) hero_recoil_right();else if (direction == 90 && (fl & HB_RECOIL)) hero_recoil_down();@@ -1452,7 +1480,7 @@ void hero_take_damage(int side, int damage, int hazard) {inv_damage();cancel_attack();if (h->cs.recoiling_left || h->cs.recoiling_right) cancel_recoil_horizontal();- if (h->cs.bouncing) cancel_bounce(), h->body.vy = 0;+ if (h->cs.bouncing || h->cs.shroom_bouncing) cancel_bounce(), h->body.vy = 0;take_health(pd_flag(PDF_OVERCHARMED) ? damage * 2 : damage);take_damage_charm_effects(damage);fury_check();diff --git a/games/hollowknight/src/map.c b/games/hollowknight/src/map.cindex 14484b75..b838d015 100644--- a/games/hollowknight/src/map.c+++ b/games/hollowknight/src/map.c@@ -554,7 +554,7 @@ static const struct { int16_t sprite; float x, y, minx, maxx, miny, maxy, speed,static const struct { float x, y, k0, k; } zoom = MAP_ZOOM;static const float pan_base[4] = MAP_PAN;-enum { A_TOWN, A_CROSSROADS, A_GREENPATH }; /* (MAP_AREAS' order) */+enum { A_TOWN, A_CROSSROADS, A_GREENPATH, A_FUNGAL }; /* (MAP_AREAS' order; the Fungal Wastes the second part's) */enum { MP_WIDE, MP_ZOOM, MP_ZOOMED, MP_ZOOM_OUT, MP_MARKERS, MP_MARKER_CANCEL };#define ARROW_L (-1)#define ARROW_R (-2)@@ -581,26 +581,45 @@ static void select_area(int a) {/* UI Control's moves (each way: the areas tried in order, their maps had; then where it goes) */static int wide_move(int from, uint32_t dir) {bool cr = have_area(A_CROSSROADS), gp = have_area(A_GREENPATH);+#ifdef HK_FW+ bool fw = have_area(A_FUNGAL);+#else+ const bool fw = false;+#endifswitch (from) {case A_TOWN: /* (T Down, T Left, T Right) */- if (dir & K_DOWN) return cr ? A_CROSSROADS : gp ? A_GREENPATH : A_TOWN;+ if (dir & K_DOWN) return cr ? A_CROSSROADS : fw ? A_FUNGAL : gp ? A_GREENPATH : A_TOWN;if (dir & K_LEFT) return gp ? A_GREENPATH : ARROW_L;return dir & K_RIGHT ? ARROW_R : A_TOWN;case A_CROSSROADS: /* (CR Up, CR Left, CR Right, CR Down) */if (dir & K_UP) return A_TOWN;- if (dir & K_LEFT) return gp ? A_GREENPATH : ARROW_L;+ if (dir & K_LEFT) return gp ? A_GREENPATH : fw ? A_FUNGAL : ARROW_L;+ if (dir & K_DOWN) return fw ? A_FUNGAL : A_CROSSROADS;return dir & K_RIGHT ? ARROW_R : A_CROSSROADS;case A_GREENPATH: /* (GP Up, GP Right, GP Left, GP Down) */if (dir & K_UP) return A_TOWN;if (dir & K_RIGHT) return cr ? A_CROSSROADS : A_TOWN;+ if (dir & K_DOWN) return fw ? A_FUNGAL : A_GREENPATH;return dir & K_LEFT ? ARROW_L : A_GREENPATH;+ case A_FUNGAL: /* (FW Up, FW Left, FW Right, FW Down) */+ if (dir & K_UP) return cr ? A_CROSSROADS : gp ? A_GREENPATH : A_TOWN;+ if (dir & K_LEFT) return gp ? A_GREENPATH : ARROW_L;+ return dir & K_RIGHT ? ARROW_R : A_FUNGAL;case ARROW_L: /* (To Map) */- return dir & K_RIGHT ? (gp ? A_GREENPATH : A_TOWN) : ARROW_L;+ return dir & K_RIGHT ? (gp ? A_GREENPATH : fw ? A_FUNGAL : A_TOWN) : ARROW_L;default: /* (To Map 2) */return dir & K_LEFT ? (cr ? A_CROSSROADS : A_TOWN) : ARROW_R;}}+/* (Pos Check: the wide map lower with the Fungal Wastes' map had, Pos 2) */+static void wide_pos(float *dx, float *dy) {+ *dx = *dy = 0;+#ifdef HK_FW+ if (have_area(A_FUNGAL)) *dx = MAP_WIDE_POS_2_DX, *dy = MAP_WIDE_POS_2_DY;+#endif+}+/* (WorldMap's bounds: widened by the areas had, or the one the Knight is in with the compass on) */static void pan_bounds(float *b) {memcpy(b, pan_base, sizeof pan_base);@@ -642,7 +661,9 @@ void map_pane_enter(bool shortcut) {static void zoom_in(void) {/* Map Zoom: the pieces unselected and down, the pane's arrows away; Game_Map from the wide map's place (0.436) */mp.st = MP_ZOOM, mp.t = 0;- mp.x = zoom.x, mp.y = zoom.y, mp.k = zoom.k0;+ float dx, dy;+ wide_pos(&dx, &dy);+ mp.x = zoom.x + dx, mp.y = zoom.y + dy, mp.k = zoom.k0;}static void zoomed(void) {@@ -763,7 +784,9 @@ int map_pane_tick(uint32_t keys, uint32_t pressed, uint32_t move, bool repeat) {float q = fminf(1, mp.t / ZOOM_TIME), e = sinf(q * 1.5707964f);const WidePiece *w = &wide[mp.sel];mp.k = zoom.k0 + (zoom.k - zoom.k0) * e;- mp.x = zoom.x + (w->zx - zoom.x) * e, mp.y = zoom.y + (w->zy - zoom.y) * e;+ float dx, dy;+ wide_pos(&dx, &dy);+ mp.x = zoom.x + dx + (w->zx - zoom.x - dx) * e, mp.y = zoom.y + dy + (w->zy - zoom.y - dy) * e;if (mp.t >= ZOOM_TIME + 0.05f) zoomed();break;}@@ -784,7 +807,9 @@ int map_pane_tick(uint32_t keys, uint32_t pressed, uint32_t move, bool repeat) {case MP_ZOOM_OUT: {float q = fminf(1, mp.t / ZOOM_OUT_TIME);mp.k = zoom.k + (zoom.k0 - zoom.k) * q;- mp.x = mp.ox + (zoom.x - mp.ox) * q, mp.y = mp.oy + (zoom.y - mp.oy) * q;+ float dx, dy;+ wide_pos(&dx, &dy);+ mp.x = mp.ox + (zoom.x + dx - mp.ox) * q, mp.y = mp.oy + (zoom.y + dy - mp.oy) * q;if (mp.t >= 0.35f) {/* Reset: the area chosen again */mp.st = MP_WIDE, mp.wide_a = 1;@@ -850,6 +875,9 @@ void map_pane_draw(float ox, float oy, float a, uint8_t white, bool current) {/* the wide map: the areas had (Dirtmouth always), their names; chosen: white (in the wide map only) */float wa = current ? mp.wide_a : 1;if (wa > 0) {+ float pdx, pdy;+ wide_pos(&pdx, &pdy);+ ox += pdx, oy += pdy;uint8_t wa8 = (uint8_t)(wa * 255 + 0.5f);/* (the names, in the smallest of the bigger text: those of areas side by side moved apart where they would meet) */float nx[NAREAS], hw[NAREAS];@@ -874,6 +902,7 @@ void map_pane_draw(float ox, float oy, float a, uint8_t white, bool current) {int z = area_of_zone();if (charm_on(2) && z >= 0 && mc.compass.sprite >= 0)hud_sprite(mc.compass.sprite, ox + wide[z].cx, oy + wide[z].cy, MAP_WIDE_COMPASS_K, 0, map_tint(0xFFFFFF, wa8));+ ox -= pdx, oy -= pdy;}/* Game_Map, zoomed into: its areas had, the marks on it */bool map_on = current && !mp.closed && (st == MP_ZOOM || st == MP_ZOOMED || st == MP_MARKERS ||diff --git a/games/hollowknight/src/obj.c b/games/hollowknight/src/obj.cindex 3aacd7a0..f7a2b10b 100644--- a/games/hollowknight/src/obj.c+++ b/games/hollowknight/src/obj.c@@ -9,7 +9,11 @@#endif#define DT 0.02f+#ifdef HK_FW+#define MAX_OBJS 96 /* (Fungus2_18's 89) */+#else#define MAX_OBJS 80 /* (the most a room has: 69, Crossroads_ShamanTemple) */+#endif#define MAX_PIECES 24typedef struct {@@ -843,6 +847,181 @@ static void scuttlers_draw(void) {}/* ---------------------------------------------------------------- the room */+#ifdef HK_FW+/* ---------------------------------------------------------------- bounce shrooms (BounceShroom) */+/* idle a while (2 to 8 s), bob, again; a touch on its Phys Box (CollisionEnterEvent) or a slash on it bounces it (its+ * Bounce clip, then idle again), and the Knight off it: a slash from above shroom bounces him high and shows its hit+ * effect (BounceLarge). The records (tools/ents.py: _shroom): it; its trigger circle and hit effect; its Phys Box's+ * bounds */+#define MAX_SHROOMS 96 /* (Fungus2_18's 95) */+#define MAX_SHROOM_FX 4+enum { SH_IDLE, SH_BOB, SH_BOUNCE };+typedef struct {+ uint16_t ent;+ uint8_t state;+ float t; /* (till it bobs, or its clip is over) */+ Anim anim;+} Shroom;+static Shroom shrooms[MAX_SHROOMS];+static int nshrooms;+static struct {+ int16_t shroom; /* (-1: none) */+ Anim anim;+} shroom_fx[MAX_SHROOM_FX];+static float shroom_clock, next_bounce_fx, next_shroom_shake; /* (BounceShroom's statics: Time.time) */++static void shroom_idle(Shroom *sh, const Ent *e) {+ anim_play_from_frame(&sh->anim, (int)e->p1, 0);+ sh->state = SH_IDLE, sh->t = rand_range(2, 8);+}++static void shrooms_enter(void) {+ nshrooms = 0;+ for (int k = 0; k < MAX_SHROOM_FX; k++) shroom_fx[k].shroom = -1;+ int n;+ const Ent *es = room_ents(&n);+ for (int i = 0; i < n; i++) {+ if (es[i].type != ENT_OBJ || es[i].flags != OK_SHROOM) continue;+#ifdef HOST+ if (nshrooms == MAX_SHROOMS) fprintf(stderr, "obj: room %d has more bounce shrooms than %d\n", g_room.id, MAX_SHROOMS);+#endif+ if (nshrooms == MAX_SHROOMS) break;+ Shroom *sh = &shrooms[nshrooms++];+ memset(sh, 0, sizeof *sh);+ sh->ent = (uint16_t)i;+ shroom_idle(sh, &es[i]);+ }+}++/* (its Bounce coroutine: once at a time) */+static void shroom_bounce(Shroom *sh, const Ent *e) {+ if (sh->state == SH_BOUNCE) return;+ anim_play_from_frame(&sh->anim, (int)e->p3, 0);+ sh->state = SH_BOUNCE, sh->t = clip_duration((int)e->p3);+}++static void shroom_bounce_large(int k, bool effects) {+ Shroom *sh = &shrooms[k];+ if (effects) {+ if (shroom_clock >= next_bounce_fx) next_bounce_fx = shroom_clock + 0.25f;+ else effects = false;+ }+ shroom_bounce(sh, ent_at(sh->ent));+ if (shroom_clock > next_shroom_shake) {+ cam_shake(SHAKE_ENEMY_KILL);+ next_shroom_shake = shroom_clock + 0.25f;+ }+ if (!effects) return;+ /* (its hit effect on: from its start, unless it is on already) */+ int free = -1;+ for (int f = 0; f < MAX_SHROOM_FX; f++) {+ if (shroom_fx[f].shroom == k) return;+ if (shroom_fx[f].shroom < 0) free = f;+ }+ if (free < 0) return;+ shroom_fx[free].shroom = (int16_t)k;+ anim_play_from_frame(&shroom_fx[free].anim, (int)ent_at(sh->ent)[1].y1, 0);+}++static void shrooms_tick(void) {+ shroom_clock += DT;+ for (int k = 0; k < nshrooms; k++) {+ Shroom *sh = &shrooms[k];+ anim_update(&sh->anim, DT);+ if ((sh->t -= DT) > 0) continue;+ const Ent *e = ent_at(sh->ent);+ if (sh->state == SH_IDLE) {+ anim_play_from_frame(&sh->anim, (int)e->p2, 0);+ sh->state = SH_BOB, sh->t = clip_duration((int)e->p2);+ } else+ shroom_idle(sh, e);+ }+ for (int f = 0; f < MAX_SHROOM_FX; f++) {+ if (shroom_fx[f].shroom < 0) continue;+ shroom_fx[f].anim.events = 0;+ anim_update(&shroom_fx[f].anim, DT);+ if (shroom_fx[f].anim.events & ANIM_DONE) shroom_fx[f].shroom = -1; /* (DeactivateAfter2dtkAnimation) */+ }+}++static void shrooms_draw(void) {+ Inst in;+ for (int k = 0; k < nshrooms; k++) {+ const Shroom *sh = &shrooms[k];+ const Ent *e = ent_at(sh->ent);+ if (fabsf(e->x0 - g_cam_x) > 16 || fabsf(e->y0 - g_cam_y) > 11) continue;+ sprite_inst(sh->anim.sprite, e->x0, e->y0, e->x1, e->y1, e->p0, 0, &in);+ gfx_actor(&in, SORT_KEY(e->group, (int)e->a - 32768));+ }+ for (int f = 0; f < MAX_SHROOM_FX; f++) {+ if (shroom_fx[f].shroom < 0) continue;+ const Ent *x = ent_at(shrooms[shroom_fx[f].shroom].ent) + 1;+ uint8_t tint = gfx_dyn_tint(10, x->group, x->group2, (uint8_t)x->a, 255);+ sprite_inst(shroom_fx[f].anim.sprite, x->p0, x->p1, (int16_t)x->s1 * 0.001f, x->p2, x->p3, tint, &in);+ gfx_actor(&in, SORT_KEY(x->flags, (int)x->s0 - 32768));+ }+}++/* a circle and a convex polygon: do they meet? */+static bool circle_meets_shape(float cx, float cy, float r, const float *pts, int n) {+ bool inside = true;+ for (int i = 0; i < n; i++) {+ float ax = pts[2 * i], ay = pts[2 * i + 1], bx = pts[2 * ((i + 1) % n)], by = pts[2 * ((i + 1) % n) + 1];+ float ex = bx - ax, ey = by - ay, l2 = ex * ex + ey * ey;+ float u = l2 > 0 ? ((cx - ax) * ex + (cy - ay) * ey) / l2 : 0;+ u = u < 0 ? 0 : u > 1 ? 1 : u;+ float dx = ax + u * ex - cx, dy = ay + u * ey - cy;+ if (dx * dx + dy * dy <= r * r) return true;+ float side = ex * (cy - ay) - ey * (cx - ax);+ if (i == 0) inside = side >= 0;+ else if ((side >= 0) != inside) return false;+ }+ return true; /* (its center inside) */+}++/* NailSlash.OnTriggerEnter2D / Stay: each step the slash touches it, it bounces (its effects only from above) */+static int shrooms_nail(const float *pts, int npts, float direction) {+ int out = 0;+ for (int k = 0; k < nshrooms; k++) {+ const Ent *x = ent_at(shrooms[k].ent) + 1;+ if (!circle_meets_shape(x->x0, x->y0, x->x1, pts, npts)) continue;+ out = HB_SHROOM;+ shroom_bounce_large(k, direction == 270);+ }+ return out;+}++/* CollisionEnterEvent (checkDirection, the Hero layer): rays 0.08 long out of its Phys Box's sides, from their ends and+ * middles; the Knight on one side is pushed off it (on top: bounced, and pushed either way), and it bounces */+void shrooms_touched(int col) {+ if (!col) return;+ const Body *b = &g_hero.body;+ float hx0 = b->x + b->ox - b->hx, hx1 = b->x + b->ox + b->hx, hy0 = b->y + b->oy - b->hy, hy1 = b->y + b->oy + b->hy;+ for (int k = 0; k < nshrooms; k++) {+ const Ent *e = ent_at(shrooms[k].ent), *q = e + 2;+ if (e->s0 != col) continue;+ float cx = (q->x0 + q->x1) * 0.5f, cy = (q->y0 + q->y1) * 0.5f;+ const float xs[3] = {q->x0, cx, q->x1}, ys[3] = {q->y0, cy, q->y1};+ bool top = false, right = false, left = false;+ for (int i = 0; i < 3; i++) {+ top |= xs[i] >= hx0 && xs[i] <= hx1 && hy0 <= q->y1 + 0.08f && hy1 >= q->y1;+ right |= ys[i] >= hy0 && ys[i] <= hy1 && hx0 <= q->x1 + 0.08f && hx1 >= q->x1;+ left |= ys[i] >= hy0 && ys[i] <= hy1 && hx1 >= q->x0 - 0.08f && hx0 <= q->x0;+ }+ bool bottom = false;+ for (int i = 0; i < 3; i++) bottom |= xs[i] >= hx0 && xs[i] <= hx1 && hy1 >= q->y0 - 0.08f && hy0 <= q->y0;+ if (top) {+ hero_bounce();+ if (rand_range(0, 2) < 1) hero_recoil_left();+ else hero_recoil_right();+ }+ if (right) hero_recoil_right();+ if (left) hero_recoil_left();+ if (top || right || bottom || left) shroom_bounce(&shrooms[k], e);+ }+}+#endif+void obj_enter(void) {nobjs = 0;phys_colliders_reset();@@ -852,6 +1031,13 @@ void obj_enter(void) {cocoon_fx_on = false;int n;const Ent *es = room_ents(&n);+#ifdef HOST+ int want = 0;+ for (int i = 0; i < n; i++)+ want += es[i].type == ENT_OBJ && es[i].flags != OK_COND && es[i].flags != OK_ENEMY && es[i].flags != OK_BENCH &&+ es[i].flags != OK_ARENA && es[i].flags != OK_EVENT && es[i].flags != OK_SUMMON && es[i].flags != OK_SHROOM;+ if (want > MAX_OBJS) fprintf(stderr, "obj: room %d has %d objects, more than %d\n", g_room.id, want, MAX_OBJS);+#endiffor (int i = 0; i < n && nobjs < MAX_OBJS; i++) {if (es[i].type != ENT_OBJ) continue;if (es[i].flags == OK_COND) {@@ -863,11 +1049,8 @@ void obj_enter(void) {continue;}if (es[i].flags == OK_ENEMY || es[i].flags == OK_BENCH || es[i].flags == OK_ARENA || es[i].flags == OK_EVENT ||- es[i].flags == OK_SUMMON)- continue; /* (enemy.c's, npc.c's; below) */-#ifdef HOST- if (nobjs == MAX_OBJS - 1) fprintf(stderr, "obj: room %d has more objects than %d\n", g_room.id, MAX_OBJS);-#endif+ es[i].flags == OK_SUMMON || es[i].flags == OK_SHROOM)+ continue; /* (enemy.c's, npc.c's, the shrooms'; below) */Obj *o = &objs[nobjs++];memset(o, 0, sizeof *o);o->kind = es[i].flags, o->ent = (uint16_t)i;@@ -886,6 +1069,9 @@ void obj_enter(void) {enemies_enter();benches_enter();arena_enter();+#ifdef HK_FW+ shrooms_enter();+#endif#ifdef HOSTif (getenv("HKOBJ"))for (int k = 0; k < nobjs; k++) {@@ -909,6 +1095,9 @@ void obj_tick(void) {else if (o->kind == OK_COCOON) cocoon_tick(o, e);}scuttlers_tick();+#ifdef HK_FW+ shrooms_tick();+#endifarena_tick();pieces_tick();enemies_update();@@ -940,6 +1129,9 @@ void obj_draw(void) {}pieces_draw();scuttlers_draw();+#ifdef HK_FW+ shrooms_draw();+#endifenemies_draw();}@@ -974,6 +1166,9 @@ int obj_nail(const float *pts, int npts, float direction) {else if (o->kind == OK_COCOON) cocoon_hit(o, e);}out |= scuttlers_nail(pts, npts);+#ifdef HK_FW+ out |= shrooms_nail(pts, npts, direction);+#endifreturn out;}diff --git a/games/hollowknight/tests/play.c b/games/hollowknight/tests/play.cindex 7ab44346..90a8b756 100644--- a/games/hollowknight/tests/play.c+++ b/games/hollowknight/tests/play.c@@ -31,6 +31,20 @@ static void run_ticks(int n, uint32_t keys) {}/* every hazard respawn point of every room (the gates' and the hazard triggers'): ground under it, in the room; and* whether the room has hazards at all */+/* (a gate no gate leads to (or one of the other part might): its marker is never where the Knight comes back) */+static bool gate_entered(int r, const char *gate) {+ bool found = false;+ for (int q = 0; q < NUM_ROOMS && !found; q++) {+ if (!room_load(q)) continue;+ int n;+ const Ent *es = room_ents(&n);+ for (int i = 0; i < n && !found; i++)+ found = es[i].type == ENT_GATE && (es[i].a == r || (es[i].a & 0x8000)) && !strcmp(str_at(es[i].s1), gate);+ }+ room_load(r);+ return found;+}+static int markers_test(void) {int bad = 0;for (int r = 0; r < NUM_ROOMS; r++) {@@ -54,10 +68,14 @@ static int markers_test(void) {float x = es[m].x0, y = es[m].y0;bool ground = phys_ray(x, y, 0, -1, 50, CF_TERRAIN, &hit);bool in = x > 0 && x < g_room.h->w && y > 0 && y < g_room.h->h;- if (!ground || !in || (ground && hit.dist > 15))- printf("%s %s ent %d (%s) marker %d at %.2f,%.2f: %s%s (hazards in the room: %d)\n", hazards ? "BAD " : "note", room_name(r), i,- es[i].type == ENT_GATE ? str_at(es[i].s0) : "trigger", m, x, y, ground ? "" : "no ground below", in ? "" : " outside the room", hazards);- bad += hazards && (!ground || !in);+ if (!ground || !in || (ground && hit.dist > 15)) {+ bool used = es[i].type != ENT_GATE || gate_entered(r, str_at(es[i].s0));+ es = room_ents(&n);+ printf("%s %s ent %d (%s) marker %d at %.2f,%.2f: %s%s (hazards in the room: %d)%s\n", hazards && used ? "BAD " : "note",+ room_name(r), i, es[i].type == ENT_GATE ? str_at(es[i].s0) : "trigger", m, x, y, ground ? "" : "no ground below",+ in ? "" : " outside the room", hazards, used ? "" : ", a gate never come in by");+ bad += hazards && used && (!ground || !in);+ }}}printf("markers: %d bad\n", bad);diff --git a/games/hollowknight/tools/actors.py b/games/hollowknight/tools/actors.pyindex 6c877fba..cb14c373 100644--- a/games/hollowknight/tools/actors.py+++ b/games/hollowknight/tools/actors.py@@ -212,7 +212,8 @@ ACTORS["bgate"] = ("sharedassets9.assets", 197, ["BG Opened", "BG Close 1", "BG"Bone Gate Opened", "Bone Gate Close", "Bone Gate Closed", "Bone Gate Open"])# lifeblood cocoons and their scuttlers (HealthCocoon, ScuttlerControl); effects (splats)ACTORS["cocoon"] = ("sharedassets6.assets", 1092, ["Cocoon Idle", "Cocoon Sweat", "Scuttler Land", "Scuttler Run"])-ACTORS["fx"] = ("resources.assets", 21298, ["Splat", "Splat2"] + (["Impact Lines"] if os.environ.get("HK_PART") == "2" else []))+ACTORS["fx"] = ("resources.assets", 21298, ["Splat", "Splat2"] ++ (["Impact Lines", "Enemy Shot", "Slam Fast"] if os.environ.get("HK_PART") == "2" else [])) # (a Spore Bomb's; an Ogre's spit, slam)# Vengeful Spirit (Fireball Top's blast, Fireball: its ball, its end, its impact on a wall)ACTORS["fireball"] = ("resources.assets", 23262, ["Blast", "Ball", "Ball End", "Fireball Wall Impact"])# water drips (WaterDrip)@@ -245,6 +246,10 @@ ACTORS["hornetcs"] = ("sharedassets19.assets", 91, ["Idle", "Jump Full", "Throw# enemies' shots (EnemyBullet)ACTORS["bullet"] = ("sharedassets32.assets", 745, ["Idle", "Impact", "Shockwave Spurt"])+if os.environ.get("HK_PART") == "2":+ # bounce shrooms (BounceShroom: its idle, bob and bounce clips, both kinds; its hit effect)+ ACTORS["shroom"] = ("sharedassets174.assets", 29, ["Idle 1", "Bob 1", "Bounce 1", "Idle 2", "Bob 2", "Bounce 2",+ "Bounce Effect"])if os.environ.get("HK_PART") == "2":# (the Shrumal Ogres' spit: Vomit Glob)ACTORS["glob"] = ("sharedassets34.assets", 1067, ["Idle", "Land"])diff --git a/games/hollowknight/tools/ents.py b/games/hollowknight/tools/ents.pyindex 147928c3..b5192eb2 100644--- a/games/hollowknight/tools/ents.py+++ b/games/hollowknight/tools/ents.py@@ -11,8 +11,8 @@ ENT_CAMLOCK, ENT_GATE, ENT_HAZARD_MARKER, ENT_RESPAWN, ENT_HAZARD_TRIGGER, ENT_MENT_OBJ, ENT_PIECE, ENT_SHADE_MARKER = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12# objects (ENT_OBJ's flags: src/obj.c)OK_BREAKABLE, OK_ENEMY, OK_GREAT_DOOR, OK_GEO_ROCK, OK_CHEST, OK_BENCH, OK_BATTLE, OK_FK_FLOOR, OK_BGATE, OK_ARENA, \- OK_EVENT, OK_SUMMON, OK_COND, OK_PROP, OK_DRIP, OK_COCOON, OK_AREA = \- 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17+ OK_EVENT, OK_SUMMON, OK_COND, OK_PROP, OK_DRIP, OK_COCOON, OK_AREA, OK_SHROOM = \+ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18# area titles (AreaTitleController: OK_AREA's p3): wait for its trigger, only on a revisit, shown on the right, only# when the Knight came in by a gate (s0), a sub area (always the small title), only once the Crossroads were visitedAF_TRIGGER, AF_REVISIT, AF_RIGHT, AF_DOOR, AF_SUB, AF_AFTER_CROSSROADS = 1, 2, 4, 8, 16, 32@@ -829,6 +829,50 @@ def prop(d, o, by_id):return lib, unity.S(clips[an["defaultClipId"]]["name"])+def _world_scale(o):+ """its world x and y scale (x negative when flipped)"""+ m = np.array(o["m3"]).reshape(3, 3)+ sx = float(np.hypot(m[0, 0], m[1, 0])) * (-1.0 if np.linalg.det(m[:2, :2]) < 0 else 1.0)+ return sx, float(np.hypot(m[0, 1], m[1, 1]))+++def _shroom(d, o, by_id, owners):+ """A bounce shroom (BounceShroom) -> its 3 records: its place, scale, clips (idle, bob, bounce), sorting and its Phys+ Box's collider (s0); its trigger circle (center, radius), its hit effect (clip, place, scale; its tint: group,+ group2, a; its sorting: flags, s0); its Phys Box's bounds (CollisionEnterEvent's rays start on them). The spores+ (particles) are left out."""+ import actors+ an = next(c["v"] for c in o["c"] if c.get("class") == "tk2dSpriteAnimator")+ assert _ref_file(d, an["library"]) == actors.ACTORS["shroom"][:2], o["path"]+ bs = next(c["v"] for c in o["c"] if c.get("class") == "BounceShroom")+ clip = lambda n: CLIP_INDEX[actors.clip_id("shroom", n)]+ m = lambda q: np.array(q["m3"]).reshape(3, 3)+ sx, sy = _world_scale(o)+ layer, order = _sorting(o)+ kids = {by_id[c]["name"]: by_id[c] for c in o.get("children", [])}+ pb, fx = kids.get("Phys Box"), kids["Bounce Shroom Hit Effect"]+ col, bounds = 0, (0, 0, 0, 0)+ if pb:+ col, n = _subcols(d, owners, pb["id"]) if owners else (0, 0)+ assert n == 1 or not owners, o["path"]+ v = next(c["v"] for c in pb["c"] if c["type"] == "BoxCollider2D")+ hx, hy, ox, oy = v["m_Size"]["x"] / 2, v["m_Size"]["y"] / 2, v["m_Offset"]["x"], v["m_Offset"]["y"]+ pts = [np.array(pb["pos"][:2]) + (m(pb) @ [ox + a * hx, oy + b * hy, 0])[:2] for a in (-1, 1) for b in (-1, 1)]+ bounds = (min(p[0] for p in pts), min(p[1] for p in pts), max(p[0] for p in pts), max(p[1] for p in pts))+ cc = next(c["v"] for c in o["c"] if c["type"] == "CircleCollider2D")+ cx, cy = np.array(o["pos"][:2]) + (m(o) @ [cc["m_Offset"]["x"], cc["m_Offset"]["y"], 0])[:2]+ r = cc["m_Radius"] * max(abs(sx), abs(sy))+ fsx, fsy = _world_scale(fx)+ tint = next(c["v"] for c in fx["c"] if c.get("class") == "tk2dSprite")["_color"]+ rgb = [int(round(tint[k] * 255)) for k in "rgb"]+ flayer, forder = _sorting(fx)+ return [rec(ENT_OBJ, OK_SHROOM, (o["pos"][0], o["pos"][1], o["pos"][2], sx),+ (sy, clip(bs["idleAnim"]), clip(bs["bobAnim"]), clip(bs["bounceAnim"])), a=order + 32768, group=layer, s0=col),+ rec(0, flayer, (float(cx), float(cy), r, clip("Bounce Effect")), (fx["pos"][0], fx["pos"][1], fsx, fsy),+ a=rgb[2], group=rgb[0], group2=rgb[1], s0=forder + 32768, s1=int(round(fx["pos"][2] * 1000)) & 0xFFFF),+ rec(0, box=bounds)]++def _sorting(o):"""Its renderer's sorting layer (index) and order."""import scene@@ -1050,6 +1094,9 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0layer, order = _sorting(o)recs.append(rec(ENT_OBJ, OK_PROP, (o["pos"][0], o["pos"][1], o["pos"][2], sx), (sy, _angle(o), ci, 0),a=order + 32768, group=layer, s0=sprites.tk2d(*sp) if sp else 0))+ bs = next((c.get("v") for c in o["c"] if c.get("class") == "BounceShroom" and c.get("v")), None)+ if bs and bs.get("active"):+ recs += _shroom(d, o, by_id, owners)hc = next((c.get("v") for c in o["c"] if c.get("class") == "HealthCocoon" and c.get("v")), None)if hc is not None:# a lifeblood cocoon: its place, its sweat's waits; its colliders, the children it hides as it breaks (a@@ -1322,5 +1369,5 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0else:print("ents: %s: HIT receiver %d has no record" % (name, target))assert ngroups[0] < MAX_GROUPS, ngroups[0]- assert len(recs) <= 448, len(recs) # (src/game.h: MAX_ENTS)+ assert len(recs) <= (576 if os.environ.get("HK_PART") == "2" else 448), len(recs) # (src/game.h: MAX_ENTS)return recs, groupsdiff --git a/games/hollowknight/tools/gamemap.py b/games/hollowknight/tools/gamemap.pyindex 282c8d63..8f18d593 100644--- a/games/hollowknight/tools/gamemap.py+++ b/games/hollowknight/tools/gamemap.py@@ -1,7 +1,7 @@"""The map (Game_Map: the areas' rooms as Cornifer drew them, rough until the quill maps them; their pins, the arrows tothe areas next to them, the areas' names; the compass, the shade's mark) and the quick map's HUD (Quick Map): MAP_*defines for data.h (src/map.c). Places are in the map's units from its root; the HUD shows them at its scale."""-import math+import math, osimport unity, textGAME_MAP = ("resources.assets", 4808)@@ -16,6 +16,11 @@ AREAS = (("Town_Tutorial", None, (4.07, -11.62), "TOWN", "Town", (4, -8.642), (2("Crossroads", "mapCrossroads", (-0.04, -7.88), "CROSSROADS", "Crossroads", (-0.04, -7.58), (2.51, -5.65), None),("Green_Path", "mapGreenpath", (16.31, -7.87), "GREEN_PATH", "Greenpath", (16.42, -7.32), (-0.12, -6),(None, 17.26, None, -6.22)))+if os.environ.get("HK_PART") == "2": # (Cornifer's in the Fungal Wastes: the second part's)+ AREAS += (("Fungal Wastes", "mapFungalWastes", (5.05, 0.47), "WASTES", "Fungal Wastes", (4.56, 1.31), (2.58, -9.18),+ (None, None, None, 4.14)),)+# (Pos 2: the wide map with the Fungal Wastes' map had, by so much from Pos 1)+WIDE_POS_2 = (0.76, -1.41)QUICK_K = 1.55 # (the map's scale: the quick map's (Check Area))# the inventory's map (Inventory/Map/World Map: UI Control): the Wide Map's place (Pos 1: the top areas' maps only),# the map zoomed into from there (Map Zoom: the wide map's place and these, at 0.436; to 1.3), the pan's bounds@@ -321,6 +326,7 @@ def pane(sprites, texts, res, h, hb, sh, flag):wx, wy = rel(hb[WM + "Wide Map"], dx, dy)zx, zy = hb[WM + "Wide Map"]["pos"][0] + dx + ZOOM_FROM[0], hb[WM + "Wide Map"]["pos"][1] + dy + ZOOM_FROM[1]out["MAP_ZOOM"] = "{%s, %s, %s, %s}" % (U(zx), U(zy), U(ZOOM_K0), U(ZOOM_K))+ out["MAP_WIDE_POS_2_DX"], out["MAP_WIDE_POS_2_DY"] = U(WIDE_POS_2[0] - WIDE_POS[0]), U(WIDE_POS_2[1] - WIDE_POS[1])out["MAP_PAN"] = "{%s}" % ", ".join(U(v) for v in PAN)gm = unity.prefab(*GAME_MAP)gmc = next(c["v"] for c in gm["objects"][0]["c"] if (c.get("class") or c["type"]) == "GameMap")diff --git a/games/hollowknight/tools/state.py b/games/hollowknight/tools/state.pyindex 77500a60..739e899d 100644--- a/games/hollowknight/tools/state.py+++ b/games/hollowknight/tools/state.py@@ -6,12 +6,13 @@ change are left to the room as it loads (ents.py: OK_COND)."""CONSTANT = {"crossroadsInfected": False, "troupeInTown": False, "clothInTown": False, "killedTraitorLord": False,"clothKilled": False, "clothLeftTown": False, "brettaLeftTown": False, "zoteDefeated": False,"brettaRescued": False, "visitedRuins": False, "visitedDeepnest": False, "colosseumSilverOpened": False,- "nymmInTown": False, "killedGrimm": False, "divineInTown": False, "fatGrubKing": False}+ "nymmInTown": False, "killedGrimm": False, "divineInTown": False, "fatGrubKing": False,+ "quirrelArchiveEncountered": False}# (the Grimm Troupe's: none of it comes this early)CONSTANT.update({"defeatedNightmareGrimm": False, "equippedCharm_40": False, "gotCharm_40": False})CONSTANT_INTS = {"flamesCollected": 0, "flamesRequired": 3, "grimmChildLevel": 1}DYNAMIC = {"visitedDirtmouth", "tisoEncounteredTown", "hasDash", "hornet1Defeated", "shamanPillar", "openedTownBuilding",- "slyRescued", "openedMapperShop"}+ "slyRescued", "openedMapperShop", "quirrelMantisEncountered", "enteredMantisLordArea", "defeatedMantisLords"}def conditions(o):diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.pyindex 523bb8d4..cdb7c0b1 100644--- a/games/hollowknight/tools/vm.py+++ b/games/hollowknight/tools/vm.py@@ -69,7 +69,7 @@ ROOMS = {"Fungus2_14": ["Shiny Item Stand", "Quirrel Mantis NPC", "Mantis Lever", "Mantis Lever (1)", "Mantis Gate", "Mantis Gate F","Mantis Floor Gate", "Inspect Region"],"Fungus2_12": ["Inspect Region"],- "Fungus2_15": ["Mantis Lever", "Mantis Lever (1)", "Mantis Lever (2)", "Mantis Lever (3)", "Mantis Lever (4)", "Mantis Gate",+ "Fungus2_15": ["_SceneManager", "Mantis Lever", "Mantis Lever (1)", "Mantis Lever (2)", "Mantis Lever (3)", "Mantis Lever (4)", "Mantis Gate","Mantis Gate (1)", "Mantis Gate (2)", "Mantis Gate (3)", "Mantis Gate (4)", "Breakable Wall", "mantis_cage_up","deepnest_mantis_gate",# (the Mantis Lords' fight, Fungus2_15_boss: their thrones, the challenge, the cage, the floors; the@@ -197,7 +197,7 @@ def _conds(o, pdf):# FSMs left out (what this port does not have: the dream nail, sounds...)SKIP_FSMS = {"npc_dream_dialogue", "Dream Dialogue", "Rotate", "Shop Open Voice", "Enviro Region", "tink_effect",- "RespawnTriggerFSM"}+ "RespawnTriggerFSM", "Music Control"}def _spins(f):