Skip to content

Free games for graphing calculators: NumWorks, TI-Nspire CX, Casio fx-CG50 and soon TI-84 Plus CE. Balatro, Celeste, Hollow Knight, Minecraft and more.

Hollow Knight: False Knight arena wall (breakable after the rage, battle gate gone, saved), invincible walls clink

Mason Chen140fe4dbf849
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.bin
index 463d1360..40f0f7f2 100644
Binary files a/games/hollowknight/src/data.bin and b/games/hollowknight/src/data.bin differ
diff --git a/games/hollowknight/src/data.h b/games/hollowknight/src/data.h
index 12789fda..94cfb7e5 100644
--- a/games/hollowknight/src/data.h
+++ b/games/hollowknight/src/data.h
@@ -667,13 +667,13 @@
#define CLIP_ANIM2_GROUND_PLINK_0 607
#define CLIP_ANIM3_FIREBALL_COLLECT_ANIM 608
#define CLIP_ANIM4_DOOR_OPEN00 609
-#define SPRITE_HERO_LIGHT 3022
-#define SPRITE_DIALOGUE_BACKBOARD 3023
-#define SPRITE_PROMPT_SHADOW 3024
-#define SPRITE_CORPSE_NAIL 3025
-#define SPRITE_FK_BARREL 3026
-#define SPRITE_FK_STAFF 3027
-#define SPRITE_DIGIT0 3582
+#define SPRITE_HERO_LIGHT 3024
+#define SPRITE_DIALOGUE_BACKBOARD 3025
+#define SPRITE_PROMPT_SHADOW 3026
+#define SPRITE_CORPSE_NAIL 3027
+#define SPRITE_FK_BARREL 3028
+#define SPRITE_FK_STAFF 3029
+#define SPRITE_DIGIT0 3589
#define STYLE_DIALOGUE 0
#define STYLE_PROMPT 1
#define STYLE_TITLE_L 2
@@ -922,11 +922,12 @@
#define VMEV_DOWN 43
#define VMEV_FIRST_MAP_UP 44
#define VMEV_FIRST_MAP_DOWN 45
+#define VMEV_FK_RAGE_COMPLETE 46
#define VMSTR_NPC_TITLE 14
-#define VMSTR_VISITED 655
-#define VMSTR_DISPLAY_RIGHT 656
+#define VMSTR_VISITED 677
+#define VMSTR_DISPLAY_RIGHT 678
#define VMSTR_HORNET_SAVER 201
-#define VMSTR_ITEM 555
+#define VMSTR_ITEM 568
#define STR_ATTACK_RANGE 24
#define STR_EVADE_RANGE 50
#define STR_SPIT_RANGE 51
@@ -956,34 +957,34 @@
#define TITLE_CHARM_SLUG 19
#define NUM_TITLES 20
#define TITLE_TABLE {{122, 123, -1, -1}, {124, 125, 126, -1}, {127, 128, -1, 129}, {130, 131, -1, 132}, {133, 134, -1, 135}, {136, 137, -1, -1}, {138, 139, 140, -1}, {141, 142, -1, -1}, {143, 144, -1, -1}, {145, 146, -1, -1}, {147, 148, -1, -1}, {149, 150, -1, -1}, {151, 152, -1, -1}, {153, 154, -1, -1}, {155, 156, -1, 157}, {158, 159, -1, 160}, {158, 159, -1, 161}, {162, 163, 164, -1}, {162, 163, -1, -1}, {165, 166, -1, 167}}
-#define SPRITE_FLEUR_TOP 3028
+#define SPRITE_FLEUR_TOP 3030
#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 3029
+#define SPRITE_FLEUR_BOT 3031
#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 3010
-#define SPRITE_MSG_BG 3030
-#define SPRITE_MSG_STOP 3031
-#define SPRITE_MSG_FLEUR 3032
-#define SPRITE_MSG_KEY 3033
-#define SPRITE_MSG_ICON_FIREBALL 3034
-#define SPRITE_MSG_ICON_DASH 3035
-#define SPRITE_GRASS_BALL 3036
-#define SPRITE_SOUL_ORB 3037
+#define SPRITE_MSG_BG 3032
+#define SPRITE_MSG_STOP 3033
+#define SPRITE_MSG_FLEUR 3034
+#define SPRITE_MSG_KEY 3035
+#define SPRITE_MSG_ICON_FIREBALL 3036
+#define SPRITE_MSG_ICON_DASH 3037
+#define SPRITE_GRASS_BALL 3038
+#define SPRITE_SOUL_ORB 3039
#define SOUL_ORB_SORT {13, 0}
#define MSG_TABLE {{168, 169, 170, 171, 172, 173}, {174, 175, 176, 177, 178, 179}}
-#define NOTICE_BACKBOARD {3038, 1.0000f, 0.6931f}
-#define TUTE_FLEUR {3032, 1.0000f, 1.0000f}
-#define TUTE_BACKBOARD {3039, 1.0000f, 0.9560f}
-#define TUTE_IMAGE {3040, 1.0000f, 1.0000f}
-#define TUTE_STOP {3031, 1.0000f, 1.0000f}
-#define FOCUS_PROMPT_BG {3041, 0.0000f, -1.7900f, 1.0000f, 1.0000f}
+#define NOTICE_BACKBOARD {3040, 1.0000f, 0.6931f}
+#define TUTE_FLEUR {3034, 1.0000f, 1.0000f}
+#define TUTE_BACKBOARD {3041, 1.0000f, 0.9560f}
+#define TUTE_IMAGE {3042, 1.0000f, 1.0000f}
+#define TUTE_STOP {3033, 1.0000f, 1.0000f}
+#define FOCUS_PROMPT_BG {3043, 0.0000f, -1.7900f, 1.0000f, 1.0000f}
#define FOCUS_PROMPT_TEXTS {{180, 0.1765f, -2.3773f, 0}, {181, 0.1765f, -3.1983f, 0}, {182, -0.0488f, -4.1348f, 1}, {183, 0.2240f, -5.2114f, 0}}
#define FOCUS_PROMPT_KEY {173, 0.4659f, -4.4341f}
-#define NOTICE_ICONS {3042, 3043, 3044, 3045}
+#define NOTICE_ICONS {3044, 3045, 3046, 3047}
#define CHARM_ICON_K 1.5000f
-#define CHARM_ICONS {-1, 3046, 3047, 3048, 3049, -1, 3050, 3051, 3052, -1, -1, -1, -1, -1, 3053, -1, -1, -1, 3054, 3055, 3056, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CHARM_ICONS {-1, 3048, 3049, 3050, 3051, -1, 3052, 3053, 3054, -1, -1, -1, -1, -1, 3055, -1, -1, -1, 3056, 3057, 3058, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
#define CHARM_NAMES {-1, 184, 185, 186, 187, -1, 188, 189, 190, -1, -1, -1, -1, -1, 191, -1, -1, -1, 192, 193, 194, -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 195
#define TXT_CHARM_TUTE_SUB 196
@@ -991,37 +992,37 @@
#define TXT_YN_YES 198
#define TXT_YN_NO 199
#define TXT_YN_NOT_ENOUGH 200
-#define MENU_LOGO {3057, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_LOGO {3059, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_LOGO_Y 3.6585f
#define MENU_START_Y -1.4181f
#define MENU_QUIT_Y -2.3582f
-#define MENU_POINTER {3058, 0.0000f, 0.0000f, 1.0023f, 1.0000f}
+#define MENU_POINTER {3060, 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 {3059, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
+#define MENU_PROFILES_FLEUR {3061, 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, {3060, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {3061, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {3062, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {3063, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {3064, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
+#define MENU_SLOT_ZONES {{2, {3062, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {3063, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {3064, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {3065, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {3066, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
#define MENU_SLOT_NZONES 5
#define MENU_SLOT_BG_DY 0.0102f
-#define MENU_SLOT_FLEUR {3065, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_FLEUR {3067, 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 {3066, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_SELECTOR {3068, 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 {3067, 0.0000f, 0.0000f, 1.0000f, 1.0025f}
+#define MENU_SLOT_CURSOR {3069, 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 {3068, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_ORB {3070, 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 {3069, 0.0000f, 0.0000f, 1.0039f, 1.0000f}
+#define MENU_SLOT_GEO {3071, 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 {3070, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_HEALTH {3072, 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
@@ -1039,9 +1040,9 @@
#define MENU_SLOT_YES_X 2.5813f
#define MENU_SLOT_NO_X 6.2296f
#define MENU_BACK_Y -5.5406f
-#define MENU_PAUSE_TOP {3071, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_TOP {3073, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_PAUSE_TOP_Y 2.3653f
-#define MENU_PAUSE_BOT {3072, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_BOT {3074, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_PAUSE_BOT_Y -1.8877f
#define MENU_PAUSE_CONTINUE_Y 0.6428f
#define MENU_PAUSE_QUIT_Y -0.4548f
@@ -1060,39 +1061,39 @@
#define TXT_ZONES {213, 214, 215, 216, 217}
#define INV_X -4.0500f
#define INV_Y 7.5500f
-#define INV_BORDER {{3073, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {3073, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {3074, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {3075, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {3076, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {3077, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
+#define INV_BORDER {{3075, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {3075, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {3076, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {3077, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {3078, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {3079, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
#define INV_NBORDER 6
-#define INV_FRAME {3078, 4.0479f, -7.1963f, 1.0f, 1.0f}
-#define INV_ARROW_L {3079, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
-#define INV_ARROW_R {3079, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_L {3080, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_R {3080, 18.0400f, -0.4300f, 1.0000f, 1.0000f}
+#define INV_FRAME {3080, 4.0479f, -7.1963f, 1.0f, 1.0f}
+#define INV_ARROW_L {3081, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
+#define INV_ARROW_R {3081, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_L {3082, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_R {3082, 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 {220, 221, 222, 223}
-#define CH_BB {3081, -7.9200f, -8.3700f, 1.0000f, 1.0000f}
+#define CH_BB {3083, -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 {3082, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
+#define CH_GLOW {3084, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
#define CH_GLOW_A 0.6970f
-#define CH_ICONS {-1, 3046, 3047, 3048, 3049, -1, 3050, 3051, 3052, -1, -1, -1, -1, -1, 3053, -1, -1, -1, 3054, 3055, 3056, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define CH_NEXT_DOT {3083, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_ICONS {-1, 3048, 3049, 3050, 3051, -1, 3052, 3053, 3054, -1, -1, -1, -1, -1, 3055, -1, -1, -1, 3056, 3057, 3058, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CH_NEXT_DOT {3085, 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 {3084, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
-#define CH_NOTCH_EMPTY {3085, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_FULL {3086, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_EMPTY {3087, 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 {3086, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
+#define CH_DIVIDER {3088, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}
-#define CH_COST_PIP {3084, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_COST_PIP {3086, 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
@@ -1101,9 +1102,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 {3087, 16.3208f, -13.2878f, 1.0f, 1.0f}
+#define CH_CONFIRM_KEY {3089, 16.3208f, -13.2878f, 1.0f, 1.0f}
#define CH_CONFIRM_KEY_W 0.6412f
-#define CH_CURSOR {3088, 0.0000f, 0.0000f, 1.0000f, 0.9756f}
+#define CH_CURSOR {3090, 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 224
@@ -1117,23 +1118,23 @@
#define TXT_CHARM_NAMES_INV {-1, 232, 233, 234, 235, -1, 236, 237, 238, -1, -1, -1, -1, -1, 239, -1, -1, -1, 240, 241, 242, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
#define TXT_CHARM_DESCS {-1, 243, 244, 245, 246, -1, 247, 248, 249, -1, -1, -1, -1, -1, 250, -1, -1, -1, 251, 252, 253, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
#define TXT_KEY_OK 254
-#define INV_FIXED {{3089, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {3090, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {3091, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {3092, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {3093, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {3094, -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}, {3095, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {3096, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}
+#define INV_FIXED {{3091, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {3092, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {3093, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {3094, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {3095, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {3096, -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}, {3097, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {3098, -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 {{3097, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3098, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3099, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3100, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
-#define INV_VESSEL_PIECES {{3101, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {3102, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {3103, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}
+#define INV_HEART_PIECES {{3099, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3100, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3101, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3102, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
+#define INV_VESSEL_PIECES {{3103, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {3104, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {3105, -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 {{3104, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3105, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3106, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3107, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3108, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3109, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}
+#define INV_EQ {{3106, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3107, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3108, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3109, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3110, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3111, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}
#define INV_EQ_BOX {{1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}}
-#define INV_TRINKETS {{3110, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {3111, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {3112, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {3113, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}
+#define INV_TRINKETS {{3112, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {3113, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {3114, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {3115, 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 {3114, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
-#define INV_DIVIDERS {{3115, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {3115, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}
+#define INV_TRINKET_BB {3116, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
+#define INV_DIVIDERS {{3117, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {3117, 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 {{255, 256}, {257, 258}, {259, 260}, {257, 261}, {257, 262}, {263, 264}}
@@ -1142,15 +1143,15 @@
#define TXT_INV_EQ {{280, 281}, {282, 283}, {284, 285}, {286, 287}, {288, 289}, {290, 291}}
#define TXT_INV_QUILL {292, 293, 294, 295}
#define TXT_INV_TRINKETS {{296, 297}, {298, 299}, {300, 301}, {302, 303}}
-#define SHOP_BACKBOARD {3116, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
-#define SHOP_MASK_TOP {3117, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
-#define SHOP_MASK_BOTTOM {3118, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
-#define SHOP_ARROW_U {3119, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
-#define SHOP_ARROW_D {3119, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
-#define SHOP_SELECTOR {3120, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
-#define SHOP_CONFIRM_GEO {3121, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
-#define SHOP_POINTER_L {3122, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
-#define SHOP_POINTER_R {3122, 6.6249f, -2.0798f, -1.0000f, 1.0000f}
+#define SHOP_BACKBOARD {3118, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
+#define SHOP_MASK_TOP {3119, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
+#define SHOP_MASK_BOTTOM {3120, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
+#define SHOP_ARROW_U {3121, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
+#define SHOP_ARROW_D {3121, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
+#define SHOP_SELECTOR {3122, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
+#define SHOP_CONFIRM_GEO {3123, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_L {3124, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_R {3124, 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 305
@@ -1170,7 +1171,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 {3123, 5.5100f, 2.5800f, 1.0000f, 1.0000f}
+#define SHOP_PEG {3125, 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}
@@ -1191,9 +1192,9 @@
#define TXT_SHOP_YES 315
#define TXT_SHOP_NO 316
#define SHOP_DESC_BOTTOM -5.0500f
-#define SHOP_ITEMS {{3125, 0.5714f, 317, 318, 150, 1, 125, -1, 0, 0}, {3125, 0.5714f, 317, 319, 500, 1, 126, 125, 0, 0}, {3126, 0.5714f, 320, 321, 550, 3, 127, -1, 0, 0}, {3127, 0.5714f, 322, 323, 950, 10, 128, -1, 0, 0}, {3128, 0.5714f, 324, 325, 300, 2, 37, -1, 0, 1}, {3129, 0.5714f, 326, 327, 200, 2, 40, -1, 0, 4}, {3130, 0.5714f, 328, 329, 1800, 0, 119, -1, 0, 0}, {3131, 0.5714f, 330, 331, 60, 11, 129, -1, 0, 0}, {3132, 0.5714f, 332, 333, 220, 2, 38, -1, 0, 2}, {3133, 0.5714f, 334, 335, 120, 0, 2, -1, 0, 0}, {3134, 0.5714f, 336, 337, 40, 9, 130, 10, 0, 0}, {3134, 0.5714f, 338, 339, 80, 9, 131, 28, 0, 0}, {3135, 0.5714f, 340, 341, 100, 16, 133, -1, 0, 0}, {3136, 0.5714f, 342, 343, 100, 16, 134, -1, 0, 0}, {3137, 0.5714f, 344, 345, 100, 16, 135, -1, 0, 0}, {3138, 0.5714f, 346, 347, 100, 16, 137, 147, 0, 0}, {3139, 0.5714f, 348, 349, 100, 16, 136, -1, 0, 0}, {3140, 0.5714f, 350, 351, 100, 17, 139, -1, 0, 0}, {3141, 0.5714f, 352, 353, 100, 17, 140, -1, 0, 0}, {3142, 0.5714f, 354, 355, 100, 17, 141, 14, 0, 0}, {3143, 0.5714f, 356, 357, 210, 17, 142, 14, 0, 0}, {3144, 0.5714f, 358, 359, 250, 2, 44, -1, 0, 8}, {3145, 0.5714f, 360, 361, 300, 2, 54, -1, 0, 18}, {3146, 0.5714f, 362, 363, 120, 2, 50, -1, 0, 14}, {3147, 0.5714f, 364, 365, 220, 2, 55, -1, 0, 19}, {3148, 0.5714f, 366, 367, 800, 2, 43, -1, 0, 7}, {3149, 0.5714f, 368, 369, 120, 8, 143, -1, 5, 0}, {3149, 0.5714f, 368, 369, 500, 8, 144, -1, 10, 0}, {3149, 0.5714f, 368, 369, 900, 8, 145, -1, 18, 0}, {3149, 0.5714f, 368, 370, 1400, 8, 146, -1, 25, 0}}
+#define SHOP_ITEMS {{3127, 0.5714f, 317, 318, 150, 1, 125, -1, 0, 0}, {3127, 0.5714f, 317, 319, 500, 1, 126, 125, 0, 0}, {3128, 0.5714f, 320, 321, 550, 3, 127, -1, 0, 0}, {3129, 0.5714f, 322, 323, 950, 10, 128, -1, 0, 0}, {3130, 0.5714f, 324, 325, 300, 2, 37, -1, 0, 1}, {3131, 0.5714f, 326, 327, 200, 2, 40, -1, 0, 4}, {3132, 0.5714f, 328, 329, 1800, 0, 119, -1, 0, 0}, {3133, 0.5714f, 330, 331, 60, 11, 129, -1, 0, 0}, {3134, 0.5714f, 332, 333, 220, 2, 38, -1, 0, 2}, {3135, 0.5714f, 334, 335, 120, 0, 2, -1, 0, 0}, {3136, 0.5714f, 336, 337, 40, 9, 130, 10, 0, 0}, {3136, 0.5714f, 338, 339, 80, 9, 131, 28, 0, 0}, {3137, 0.5714f, 340, 341, 100, 16, 133, -1, 0, 0}, {3138, 0.5714f, 342, 343, 100, 16, 134, -1, 0, 0}, {3139, 0.5714f, 344, 345, 100, 16, 135, -1, 0, 0}, {3140, 0.5714f, 346, 347, 100, 16, 137, 147, 0, 0}, {3141, 0.5714f, 348, 349, 100, 16, 136, -1, 0, 0}, {3142, 0.5714f, 350, 351, 100, 17, 139, -1, 0, 0}, {3143, 0.5714f, 352, 353, 100, 17, 140, -1, 0, 0}, {3144, 0.5714f, 354, 355, 100, 17, 141, 14, 0, 0}, {3145, 0.5714f, 356, 357, 210, 17, 142, 14, 0, 0}, {3146, 0.5714f, 358, 359, 250, 2, 44, -1, 0, 8}, {3147, 0.5714f, 360, 361, 300, 2, 54, -1, 0, 18}, {3148, 0.5714f, 362, 363, 120, 2, 50, -1, 0, 14}, {3149, 0.5714f, 364, 365, 220, 2, 55, -1, 0, 19}, {3150, 0.5714f, 366, 367, 800, 2, 43, -1, 0, 7}, {3151, 0.5714f, 368, 369, 120, 8, 143, -1, 5, 0}, {3151, 0.5714f, 368, 369, 500, 8, 144, -1, 10, 0}, {3151, 0.5714f, 368, 369, 900, 8, 145, -1, 18, 0}, {3151, 0.5714f, 368, 370, 1400, 8, 146, -1, 25, 0}}
#define SHOP_FIRST {0, 8, 21, 30}
-#define SHOP_ROW_GEO {3124, 1.4551f, 0.0000f, 1.0000f, 1.0000f}
+#define SHOP_ROW_GEO {3126, 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}
@@ -1208,21 +1209,21 @@
#define COLLECT_MOVER_TO {-7.7000f, 6.0400f}
#define STAG_AT {0.3000f, 0.3000f}
#define STAG_K 1.2646f
-#define STAG_BACKING {3150, -0.4427f, 0.0000f, 1.0000f, 0.6408f}
+#define STAG_BACKING {3152, -0.4427f, 0.0000f, 1.0000f, 0.6408f}
#define STAG_BACKING_A 0.9020f
-#define STAG_PIECES {{3151, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {3152, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {3153, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3154, 0.4147f, 1.5909f, 1.0000f, 1.0000f}}
+#define STAG_PIECES {{3153, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {3154, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {3155, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3156, 0.4147f, 1.5909f, 1.0000f, 1.0000f}}
#define STAG_OPENED {-1, 155, 156}
#define STAG_MARKS {{2.9379f, 3.7471f}, {4.8742f, 2.0690f}, {-0.4360f, 2.7790f}}
#define STAG_SELECTOR {0.0000f, 0.0000f, 1.1797f, 1.2092f}
-#define STAG_MAP_KNIGHT {3155, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
-#define STAG_MAP_SHADOW {3156, 0.0110f, -0.0100f, 1.0000f, 0.9227f}
+#define STAG_MAP_KNIGHT {3157, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define STAG_MAP_SHADOW {3158, 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 {3157, 2.8680f, 0.6180f, -1.0000f, 1.0000f}
-#define STAG_POINTER_L {3157, -2.8680f, 0.6180f, 1.0000f, 1.0000f}
+#define STAG_POINTER_R {3159, 2.8680f, 0.6180f, -1.0000f, 1.0000f}
+#define STAG_POINTER_L {3159, -2.8680f, 0.6180f, 1.0000f, 1.0000f}
#define STAG_ROW {-7.5992f, 3.9576f}
-#define STAG_LIST_KNIGHT {3155, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
-#define STAG_DIVIDER {3158, -7.6003f, 5.2734f, -1.0000f, -0.8696f}
+#define STAG_LIST_KNIGHT {3157, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
+#define STAG_DIVIDER {3160, -7.6003f, 5.2734f, -1.0000f, -0.8696f}
#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}
#define TXT_STAG_STATIONS 375
#define TXT_STAG_NAMES {376, 336, 338}
@@ -1238,48 +1239,48 @@
#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, 3159, 3160, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 0, 3166, 3167, -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, 3169, 3170, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 19, 3171, -1, 1.4650f, 4.4640f, 0.6500f, 0.3100f, 0xB5DDFB, 0}, {1, 255, 3172, 3173, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 15, 3174, 3175, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 9, 3176, -1, -3.0980f, 6.4880f, 1.1110f, 0.4800f, 0xB5DDFB, 0}, {1, 10, 3178, 3179, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 25, 3180, -1, -0.6440f, 4.4430f, 0.7000f, 0.3700f, 0xB5DDFB, 0}, {1, 14, 3182, 3183, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 20, 3184, 3185, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 17, 3186, 3187, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 16, 3188, 3189, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3190, 3191, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3192, 3193, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 26, 3194, -1, -3.7180f, 5.7650f, 2.3517f, 0.4300f, 0xB5DDFB, 0}, {1, 13, 3196, 3197, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 24, 3198, 3199, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 8, 3200, 3201, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 11, 3202, -1, -1.5030f, 5.1050f, 0.8500f, 0.8900f, 0xB5DDFB, 0}, {1, 21, 3203, -1, 3.7290f, 3.4460f, 2.4100f, 0.6600f, 0xB5DDFB, 0}, {1, 18, 3205, 3206, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 6, 3207, 3208, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 5, 3209, 3210, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 3211, 3212, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 33, 3213, 3214, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 32, 3215, 3216, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 3217, 3218, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 35, 3219, -1, -12.3910f, 5.0270f, 0.5700f, 1.9700f, 0xCFFFC3, 0}, {2, 34, 3220, 3221, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3222, 3223, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 30, 3224, -1, -9.2170f, 5.6940f, 1.2300f, 0.4400f, 0xCFFFC3, 0}, {2, 36, 3225, -1, -12.9760f, 5.8120f, 0.6000f, 0.3000f, 0xCFFFC3, 0}, {2, 255, 3226, 3227, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3228, 3229, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 37, 3230, 3231, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 31, 3232, -1, -10.4130f, 5.6780f, 1.1700f, 0.5500f, 0xCFFFC3, 0}, {2, 29, 3233, 3234, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 28, 3235, 3236, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 27, 3237, 3238, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}
-#define MAP_PINS {{0, 0, 3161, -2.0390f, 7.7500f, 133, -1}, {0, 0, 3162, -1.6430f, 7.7500f, 137, -1}, {0, 0, 3163, -2.4700f, 7.7500f, 135, 122}, {0, 0, 3164, -1.2540f, 7.7600f, 135, 123}, {1, 1, 3168, -6.2100f, 7.6800f, 134, -1}, {2, 1, 3168, -1.3150f, 5.0920f, 134, -1}, {4, 0, 3162, 1.2400f, 4.4520f, 137, -1}, {4, 0, 3161, 1.6210f, 4.4490f, 133, -1}, {7, 0, 3177, -3.0697f, 6.4597f, 135, -1}, {9, 0, 3161, -0.3430f, 4.4060f, 133, -1}, {9, 0, 3181, -0.7200f, 4.3930f, 136, -1}, {20, 0, 3161, -1.6940f, 5.0880f, 133, -1}, {21, 0, 3204, 4.5530f, 3.3700f, 135, 124}, {21, 0, 3161, 4.9480f, 3.3820f, 133, -1}, {26, 1, 3168, -10.9970f, 6.6240f, 134, -1}, {27, 0, 3161, -11.2580f, 4.9690f, 133, -1}, {33, 0, 3161, -12.8160f, 5.7890f, 133, -1}, {33, 0, 3162, -13.1960f, 5.7970f, 137, -1}, {39, 0, 3161, -7.6610f, 6.0700f, 133, -1}}
-#define MAP_NEXT {{0, 3165, -1.0730f, 6.4850f, 180.0000f, 380, -1.0730f, 6.1870f, 1, -1}, {16, 3195, -5.2607f, 5.8454f, 90.0000f, 382, -5.5969f, 6.0434f, 2, 16}, {24, 3165, -1.0730f, 7.2500f, 0.0000f, 379, -1.0930f, 7.9120f, 1, -1}, {40, 3165, -4.5300f, 5.8450f, -90.0000f, 380, -4.1075f, 6.0470f, 0, 6}}
+#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_QUICK_K 1.5500f
-#define MAP_SHADE {{3239, 0.0055f, -0.0110f, 178}, {3240, 0.0000f, 0.0000f, 255}}
-#define MAP_MARKERS {3241, 3242, 3243, 3244}
+#define MAP_SHADE {{3241, 0.0055f, -0.0110f, 178}, {3242, 0.0000f, 0.0000f, 255}}
+#define MAP_MARKERS {3243, 3244, 3245, 3246}
#define MAP_COMPASS_K 0.7000f
#define MAP_BG_A 0.4438f
#define MAP_TITLE {0.0000f, 7.5363f}
-#define MAP_TITLE_BACK {3245, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}
-#define MAP_NO_MAP {3246, 0.0000f, 0.9400f}
+#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_NO_MAP_MSG {386, -0.0600f, -1.2932f}
-#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 387, 3247, 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, 3249, 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 {{3248, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3249, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3250, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}
+#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_KEY {391, 0.0900f, -2.3200f}
-#define MAP_WIDE {{{3251, 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}}, {{3252, 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}}, {{3253, -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 {{{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_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 {{3254, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3254, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3254, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3254, 17.1900f, -7.1700f, 1.0f, -90.0000f}}
-#define MAP_ACT_CONFIRM {{3255, 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 {{3255, -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 {{3255, 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 {{3255, -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 {{3255, 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 {3256, 13.6200f, 3.4200f, 0.3781f, 1.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_KEY_STEP -0.8250f
-#define MAP_KEY_ROWS {{{3257, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 404, {12.7550f, -1.5413f, 15.3500f}}, {{3258, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 405, {12.7550f, -1.5413f, 15.3500f}}, {{3259, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 406, {12.7550f, -1.5413f, 15.3500f}}, {{3260, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 407, {12.7550f, -1.5413f, 15.3500f}}, {{3261, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 408, {12.7550f, -1.5413f, 15.3500f}}}
+#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_FLAGS {133, 134, 135, 136, 137}
#define MAP_KEY_N 5
-#define MAP_MM_PIECES {{3262, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3263, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3264, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3265, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}
-#define MAP_MM_MARKERS {3266, 3267, 3268, 3269}
+#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_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 {3270, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}
+#define MAP_MM_PLACE {3272, 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 409
diff --git a/games/hollowknight/src/enemy.c b/games/hollowknight/src/enemy.c
index 10abbd98..5bd73d55 100644
--- a/games/hollowknight/src/enemy.c
+++ b/games/hollowknight/src/enemy.c
@@ -2692,6 +2692,7 @@ static void fk_update(Enemy *e) {
fk_hitter(e, -1);
anim_play(&e->anim, CLIP_FK_IDLE);
e->st = FK_RAGE_END, e->t0 = 0;
+ vm_broadcast(VMEV_FK_RAGE_COMPLETE); /* (the arena's wall: breakable) */
} else
e->st = FK_RAGE, e->t0 = 0, fk_hitter(e, CLIP_FK_RAGE);
}
diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.h
index 5cced0ee..072a4847 100644
--- a/games/hollowknight/src/game.h
+++ b/games/hollowknight/src/game.h
@@ -39,7 +39,8 @@ enum {
PDF_SALUBRA_NOTCH4, PDF_MET_STAG, PDF_CORNIFER_AT_HOME, PDF_ISELDA_CONVO1, PDF_ISELDA_CORNIFER_HOME_CONVO,
PDF_SALUBRA_CONVO_COMBO, PDF_SALUBRA_CONVO_OVERCHARM, PDF_SALUBRA_CONVO_TRUTH, PDF_SLY_CONVO_MAPPER,
PDF_OPENED_CROSSROADS, PDF_OPENED_GREENPATH, PDF_TRAVELLING, PDF_STAG_REMEMBER1, PDF_STAG_CONVO_TISO,
- PDF_QUIRREL_LEFT_EGG_TEMPLE, PDF_MET_CORNIFER, PDF_CORN_CROSSROADS_ENCOUNTERED, PDF_CORNIFER_INTRODUCED, PDF_MENDER_SIGN_BROKEN, PDF_COUNT
+ PDF_QUIRREL_LEFT_EGG_TEMPLE, PDF_MET_CORNIFER, PDF_CORN_CROSSROADS_ENCOUNTERED, PDF_CORNIFER_INTRODUCED, PDF_MENDER_SIGN_BROKEN,
+ PDF_FALSE_KNIGHT_WALL_REPAIRED, PDF_FALSE_KNIGHT_WALL_BROKEN, PDF_COUNT
};
typedef struct {
/* (saved: the layout only ever grows into reserved) */
@@ -133,6 +134,7 @@ enum { BG_CLOSE, BG_QUICK_CLOSE, BG_OPEN, BG_QUICK_OPEN, BG_DESTROY };
void gates_event(int ev);
int gate_find(uint16_t name); /* (a gate by its name: the scripts' strings) */
void gate_event_at(int k, int ev);
+void gate_off(int k); /* (ActivateGameObject false: gone) */
int camlock_find(uint16_t name); /* (a camera lock area, a mask, by its name: the scripts' strings) */
void arena_start(void); /* START (sent by an enemy) */
void arena_enemy_died(void); /* (one it counts) */
diff --git a/games/hollowknight/src/obj.c b/games/hollowknight/src/obj.c
index 43baadae..351118c2 100644
--- a/games/hollowknight/src/obj.c
+++ b/games/hollowknight/src/obj.c
@@ -465,6 +465,10 @@ int camlock_find(uint16_t name) {
return -1;
}
+void gate_off(int k) {
+ if (k >= 0 && k < nobjs && objs[k].kind == OK_BGATE) gate_gone(&objs[k], ent_at(objs[k].ent));
+}
+
void gate_event_at(int k, int ev) {
if (k >= 0 && k < nobjs && objs[k].kind == OK_BGATE) gate_event(&objs[k], ent_at(objs[k].ent), ev);
}
diff --git a/games/hollowknight/src/vm.c b/games/hollowknight/src/vm.c
index 0100b119..7edcf205 100644
--- a/games/hollowknight/src/vm.c
+++ b/games/hollowknight/src/vm.c
@@ -393,6 +393,10 @@ static void obj_set_active(int o, bool on) {
if (on) vm.title_start = true;
return;
}
+ if (o >= O_GATE && o < O_GATE + 0x100) {
+ if (!on) gate_off(o - O_GATE); /* (a battle gate off: gone) */
+ return;
+ }
if (!obj_ok(o)) return;
bool was = obj_active(o);
if (on) vm.objs[o].flags |= OF_ACTIVE;
@@ -892,7 +896,8 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
case VMOP_FINDCHILD: {
int o = oval(f, rv(&r));
uint16_t name = (uint16_t)val(f, rv(&r));
- set_var(f, rb(&r), find_child(o, name));
+ int c = find_child(o, name), g = c == NONE ? gate_find(name) : -1;
+ set_var(f, rb(&r), g >= 0 ? O_GATE + g : c); /* (a battle gate among its children: obj.c's) */
return true;
}
case VMOP_GETPARENT: {
@@ -1456,6 +1461,8 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
case 23: if (!h->cs.on_ground) h->cs.will_hard_land = true; break; /* (ForceHardLanding) */
case 24: hero_add_health((int)a0); break; /* (AddHealth) */
case 25: hero_add_mp_charge((int)a0); break; /* (TryAddMPChargeSpa) */
+ case 26: hero_recoil_left(); break;
+ case 27: hero_recoil_right(); break;
case 21: {
/* (GetState: tools/vm.py's HERO_STATES) */
int k = (int)a0;
diff --git a/games/hollowknight/tests/play.c b/games/hollowknight/tests/play.c
index 29c47120..349f1f16 100644
--- a/games/hollowknight/tests/play.c
+++ b/games/hollowknight/tests/play.c
@@ -120,7 +120,7 @@ int main(int argc, char **argv) {
/* (HKREENTER=tick: the room entered again then, as it was left) */
if (getenv("HKREENTER") && atoi(getenv("HKREENTER")) == tick) game_enter(id, px, py, true);
if (getenv("HKGOD")) g_pd.health = g_pd.max_health;
- if (getenv("HKHIT") && atoi(getenv("HKHIT")) <= tick &&
+ if (getenv("HKHIT") && atoi(getenv("HKHIT")) <= tick && (!getenv("HKHITEND") || tick < atoi(getenv("HKHITEND"))) &&
tick % (getenv("HKHITN") ? atoi(getenv("HKHITN")) : 10) == 0) {
extern void enemies_debug_hit(int damage);
enemies_debug_hit(getenv("HKHITD") ? atoi(getenv("HKHITD")) : 21);
diff --git a/games/hollowknight/tools/coll.py b/games/hollowknight/tools/coll.py
index b4774a90..1854c083 100644
--- a/games/hollowknight/tools/coll.py
+++ b/games/hollowknight/tools/coll.py
@@ -99,7 +99,10 @@ def path_key(d):
# objects off in the scene whose colliders the scripts turn on (ActivateAllChildren): there, off at first
-SWITCHED = {"Hornet Saver/Colliders"}
+SWITCHED = {"Hornet Saver/Colliders", "Fk Break Wall/Breakable", "Fk Break Wall/Repaired", "Fk Break Wall/Broken/Slope",
+ "Fk Break Wall/Broken/Roof Collider"}
+# (solid though on another layer: the False Knight's broken wall's slope, on Hero Detector, which the Knight meets)
+SOLID_PATHS = {"Fk Break Wall/Broken/Slope"}
def room(d, w, h):
@@ -108,7 +111,7 @@ def room(d, w, h):
segs, cols, owners = [], [CF_SOLID | CF_TERRAIN], [0]
tm_edges = []
for o in sorted(d["objects"], key=path_key(d)):
- if (not o["active"] and o["path"] not in SWITCHED) or o["layer"] not in SOLID_LAYERS:
+ if (not o["active"] and o["path"] not in SWITCHED) or (o["layer"] not in SOLID_LAYERS and o["path"] not in SOLID_PATHS):
continue
if "TileMap Render Data/" in o["path"]:
for c in o["c"]:
diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.py
index 31230bb7..459c8be1 100644
--- a/games/hollowknight/tools/vm.py
+++ b/games/hollowknight/tools/vm.py
@@ -32,7 +32,8 @@ ROOMS = {
"_Props/Tute Door 5/Active/Jump Reminder", "_Props/Tut_tablet_top", "_Props/Tut_tablet_top (1)",
"_Props/Tut_tablet_top (2)"], # (its chest: src/obj.c, which turns on what is in it)
"Fungus1_22": ["Shiny Item", "Gate Switch", "Metal Gate", "Breakable Wall"],
- "Crossroads_10": ["Key Giver", "Breakable Wall"],
+ # (Fk Break Wall's Escape Checker finds no False Knight: its scene loads after it looks, as SceneLoad's LoadBoss)
+ "Crossroads_10": ["Key Giver", "Breakable Wall", "Fk Break Wall"],
# the shops: their keepers, their regions (the menu: src/shop.c)
"Room_shop": ["Basement Closed"],
"Room_mapper": ["Iselda", "Shop Region"],
@@ -73,6 +74,10 @@ def _piece(doc, q, rigid=True):
ob = next((c.get("v") or {} for c in q["c"] if c.get("class") == "ObjectBounce"), None)
sp = next((c.get("v") or {} for c in q["c"] if c.get("class") == "SpinSelf"), None)
ss = next((c.get("v") or {} for c in q["c"] if c.get("class") == "SpinSelfSimple"), None)
+ sf = next((c["fsm"] for c in q["c"] if c.get("fsm") and _spins(c["fsm"])), None)
+ if ss is None and sf is not None:
+ # (a piece's FSM that spins it: as SpinSelfSimple)
+ ss = {"spinFactor": sf["vars"]["Spin Factor"][1], "randomStartRotation": sf["vars"]["Random Start Rotation"][1]}
# (SpinSelf: a push of its speed times its factor, turned at random first; SpinSelfSimple: against its speed)
spin, flags = (sp.get("spinFactor", -7.5), 3) if sp is not None else (-ss.get("spinFactor", 0), 1 | (2 if ss.get("randomStartRotation") else 0)) if ss is not None else (0, 0)
return {"sprite": PIECE_SPRITES(doc, sr["m_Sprite"], max(sx, sy)), "layer": scene.layer_index(sr.get("m_SortingLayerID", 0)),
@@ -140,13 +145,27 @@ def _behaviours(rm, o):
# 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"}
+
+
+def _spins(f):
+ """A piece's FSM that spins it against its speed (as SpinSelfSimple: the piece's, src/obj.c)."""
+ return f["name"] == "FSM" and {s["name"] for s in f["states"]} == {"Spin At Start?", "Wait", "Randomise z", "Spin"}
+
+
+def _tinks(f):
+ """An enemy's old health FSM, Invincible: all a hit does is its Blocked Hit (as tink_effect's)."""
+ return f["name"] == "FSM" and f["vars"].get("Invincible") == ["bool", True] and \
+ any(s["name"] == "Blocked Hit" for s in f["states"])
+
+
# objects left out (effects drawn by the C code, or nothing at all; the dream nail's; Dreamer Scene 1's Knight Lift,
# which nothing turns on)
SKIP_CLASSES = {"SpellGetOrb", "ParticleSystem"}
SKIP_NAMES = {"Dream Dialogue", "Dream Dialogue Flower", "Flower", "Flower Give", "white_light", "white_light 1",
"Knight Lift"}
-# (the Mender House's door: its inspect region, for a key there is none of, never on)
-SKIP_PATHS = {("Crossroads_04", "_Transition Gates/Mender Door/Inspect")}
+# (the Mender House's door: its inspect region, for a key there is none of, never on; the False Knight's arena wall's
+# 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, 26, 256, 20 # (src/vm.c)
# the grubs in this part of the game (Crossroads_03, Fungus1_21): the Grubfather's rewards past them never come
GRUBS = 2
@@ -220,7 +239,8 @@ for e in ("FINISHED", "CONVO_FINISH", "CONVO START", "CONVO END", "BIG TITLE STA
"HORNET LEAVE", "BG CLOSE", "BG QUICK CLOSE", "BG OPEN", "BG QUICK OPEN", "BG DESTROY", "WAKE", "BOX UP DREAM",
"BOX DOWN DREAM", "FADE IN", "FADE OUT", "FSM CANCEL", "CLOSE", "FK DEATH", "SHOP UP", "SHOP CLOSED",
"SHOP CLOSED QUICK", "SHOP WINDOW UP", "RESET SHOP WINDOW", "CLOSE SHOP WINDOW", "BOX UP YN", "BOX DOWN YN",
- "YES", "NO", "CONTINUE", "RESET", "HIT", "UNCOVER", "UP", "DOWN", "FIRST MAP UP", "FIRST MAP DOWN"):
+ "YES", "NO", "CONTINUE", "RESET", "HIT", "UNCOVER", "UP", "DOWN", "FIRST MAP UP", "FIRST MAP DOWN",
+ "FK RAGE COMPLETE"):
EVENTS.id(e)
FIXED_EVENTS = len(EVENTS.list) # (src/data.h: VMEV_*)
@@ -407,7 +427,8 @@ HERO_METHODS = ["RelinquishControl", "RegainControl", "StopAnimationControl", "S
"FaceRight", "CanTalk", "PreventCastByDialogueEnd", "SetBackOnGround", "AddMPCharge",
"FindGroundPoint", "SetBenchRespawn", "SetHazardRespawn", "RelinquishControlNotVelocity",
"SetCState", "SaveGame", "AffectedByGravity", "ResetHardLandingTimer", "StopPlayingAudio", "CanInspect",
- "CanInput", "GetState", "CancelHeroJump", "ForceHardLanding", "AddHealth", "TryAddMPChargeSpa"]
+ "CanInput", "GetState", "CancelHeroJump", "ForceHardLanding", "AddHealth", "TryAddMPChargeSpa", "RecoilLeft",
+ "RecoilRight"]
# (GetState's states, by name: its argument)
HERO_STATES = ["onGround", "attacking", "upAttacking", "downAttacking", "dashing", "backDashing", "willHardLand",
"spellQuake"] # (backDashing, spellQuake: never here)
@@ -1187,13 +1208,15 @@ class Compiler:
speedMin=P.get("speedMin"), speedMax=P.get("speedMax"),
angleMin=P.get("angleMin"), angleMax=P.get("angleMax")))
return out or None
- if n == "SpawnRandomObjects":
+ if n in ("SpawnRandomObjects", "SpawnRandomObjectsV2"):
r = P.get("gameObject")
import ents
f, pid = ents._ref_file(self.o.get("_doc") or self.rm.d, [r[1], r[2]])
d2 = unity.prefab(f, pid)
pp = _piece(d2, d2["objects"][0])
- if pp is None or (P.get("originVariation") or 0) != 0:
+ if not any(c["type"] in ("SpriteRenderer", "MeshRenderer") for q in d2["objects"] for c in q["c"]):
+ return None # (particles: not drawn here)
+ if pp is None or any(P.get(k) for k in ("originVariation", "originVariationX", "originVariationY")):
self.problem("SpawnRandomObjects %s %s" % (f, pid))
return None
pos = P.get("position") or [0, 0, 0]
@@ -1309,7 +1332,7 @@ class Compiler:
return None
if fn in ("advanceTypewriter", "TimePasses", "StoryRecord_acquired", "StoryRecord_visited", "SetActionString",
"RefreshButtonIcon", "StopBounce", "CheckGrubAchievements", "AddToGrubList", "CountCharms",
- "TriggerStartVideo", "CheckAllMaps"):
+ "TriggerStartVideo", "CheckAllMaps", "CancelSuperDash"):
return None
self.problem("SendMessage %s" % fn)
return None
@@ -1570,7 +1593,8 @@ def prepare(rooms, sprites, texts):
for c in o["c"] + _behaviours(rm, o):
f = c.get("fsm")
# (a door's own scripts: the game's gates are its doors here)
- if not f or f["name"] in SKIP_FSMS or any(c2.get("class") == "TransitionPoint" for c2 in o["c"]):
+ if not f or f["name"] in SKIP_FSMS or _tinks(f) or _spins(f) or \
+ any(c2.get("class") == "TransitionPoint" for c2 in o["c"]):
continue
cp = Compiler(rm, o, f)
body, init = cp.compile()
@@ -1761,7 +1785,7 @@ def room_blob(name, clip_index, sprites, owners=(), persist=None):
blend = {"alpha": 0, "add": 1, "screen": 2, "linearlight": 3, "overlay": 4, "multiply": 5}[
scene.blend_of(unity.material(unity.ref_path(doc, m0[0]), m0[1])[1])]
# (tink_effect: the nail clinks off it, the Knight recoils: blend's high bit)
- if any(c.get("fsm") and c["fsm"]["name"] == "tink_effect" for c in o["c"]):
+ if any(c.get("fsm") and (c["fsm"]["name"] == "tink_effect" or _tinks(c["fsm"])) for c in o["c"]):
blend |= 0x8000
col = (mr or {}).get("m_Color") or {"r": 1, "g": 1, "b": 1, "a": 1}
rgba = [max(0, min(255, int(round(col[k] * 255)))) for k in "rgba"]