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: Fungal Wastes: on to Queen's Station, its stag

Mason3639bd66d3f582f
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.bin
index a0fb5f25..d7ba43d3 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 32fc0816..1081fa40 100644
--- a/games/hollowknight/src/data.h
+++ b/games/hollowknight/src/data.h
@@ -679,7 +679,7 @@
#define SPRITE_CORPSE_NAIL 2871
#define SPRITE_FK_BARREL 2872
#define SPRITE_FK_STAFF 2873
-#define SPRITE_DIGIT0 3439
+#define SPRITE_DIGIT0 3440
#define STYLE_DIALOGUE 0
#define STYLE_PROMPT 1
#define STYLE_TITLE_L 2
@@ -1240,83 +1240,84 @@
#define COLLECT_GLOW {0.0263f, -0.0329f, -0.5000f, 2.0000f}
#define COLLECT_PIECE {{0.1200f, 0.1000f, 0.0000f, 1.0000f}, {-0.0016f, -0.2000f, -1.0000f, 1.0216f}}
#define COLLECT_MOVER_TO {-7.7000f, 6.0400f}
+#define STAG_N 4
#define STAG_AT {0.3000f, 0.3000f}
#define STAG_K 1.2646f
#define STAG_BACKING {2996, -0.4427f, 0.0000f, 1.0000f, 0.6408f}
#define STAG_BACKING_A 0.9020f
-#define STAG_PIECES {{2997, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2998, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2999, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3000, 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_PIECES {{2997, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2998, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2999, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3000, 0.4147f, 1.5909f, 1.0000f, 1.0000f}, {3001, 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 {3001, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
-#define STAG_MAP_SHADOW {3002, 0.0110f, -0.0100f, 1.0000f, 0.9227f}
+#define STAG_MAP_KNIGHT {3002, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define STAG_MAP_SHADOW {3003, 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 {3003, 2.8680f, 0.6180f, -1.0000f, 1.0000f}
-#define STAG_POINTER_L {3003, -2.8680f, 0.6180f, 1.0000f, 1.0000f}
+#define STAG_POINTER_R {3004, 2.8680f, 0.6180f, -1.0000f, 1.0000f}
+#define STAG_POINTER_L {3004, -2.8680f, 0.6180f, 1.0000f, 1.0000f}
#define STAG_ROW {-7.5992f, 3.9576f}
-#define STAG_LIST_KNIGHT {3001, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
-#define STAG_DIVIDER {3004, -7.6003f, 5.2734f, -1.0000f, -0.8696f}
+#define STAG_LIST_KNIGHT {3002, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
+#define STAG_DIVIDER {3005, -7.6003f, 5.2734f, -1.0000f, -0.8696f}
#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}
#define TXT_STAG_STATIONS 412
-#define TXT_STAG_NAMES {413, 373, 375}
-#define STAG_NAMES_STR {124, 123, 127}
+#define TXT_STAG_NAMES {413, 373, 375, 414}
+#define STAG_NAMES_STR {124, 123, 127, 126}
#define STAG_BORDER_TOP {-0.0963f, 7.0185f, 0.9784f, 1.0028f, CLIP_STAGUI_STAG_BORDER_TOP_UP, CLIP_STAGUI_STAG_BORDER_TOP_DOWN, 0}
#define STAG_BORDER_BOTTOM {-0.0638f, -6.5632f, 0.9165f, 0.9394f, CLIP_STAGUI_STAG_BORDER_BOTTOM_UP, CLIP_STAGUI_STAG_BORDER_BOTTOM_DOWN, 0}
#define STAG_T_ACT_CONFIRM {11.1713f, -4.5306f, 15.3500f}
#define STAG_KEY_CONFIRM {11.7464f, -4.7993f}
-#define TXT_STAG_CTRL_TRAVEL 414
+#define TXT_STAG_CTRL_TRAVEL 415
#define STAG_T_ACT_CANCEL {11.1713f, -5.3525f, 15.3500f}
#define STAG_KEY_CANCEL {11.7464f, -5.6213f}
#define TXT_STAG_CTRL_CANCEL 348
-#define STAG_SCENES_STR {137, 136, 138}
-#define STAG_SCENES_ROOM {4, 19, 36}
-#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 418, 0x14u}, {2, 24, 130, -0.0400f, -7.8800f, 421, 0x400020u}, {26, 16, 131, 16.3100f, -7.8700f, 422, 0x40u}}
-#define MAP_ROOMS {{0, 1, 3005, 3006, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 0, 3012, 3013, -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, 127, 3015, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 3016, 3017, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 19, 3018, -1, 1.4650f, 4.4640f, 0.6500f, 0.3100f, 0xB5DDFB, 0}, {1, 255, 3019, 3020, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 15, 3021, 3022, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 9, 3023, -1, -3.0980f, 6.4880f, 1.1110f, 0.4800f, 0xB5DDFB, 0}, {1, 10, 3025, 3026, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 25, 3027, -1, -0.6440f, 4.4430f, 0.7000f, 0.3700f, 0xB5DDFB, 0}, {1, 14, 3029, 3030, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 20, 3031, 3032, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 17, 3033, 3034, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 16, 3035, 3036, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3037, 3038, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3039, 3040, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 26, 3041, -1, -3.7180f, 5.7650f, 2.3517f, 0.4300f, 0xB5DDFB, 0}, {1, 13, 3043, 3044, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 24, 3045, 3046, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 8, 3047, 3048, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 11, 3049, -1, -1.5030f, 5.1050f, 0.8500f, 0.8900f, 0xB5DDFB, 0}, {1, 21, 3050, -1, 3.7290f, 3.4460f, 2.4100f, 0.6600f, 0xB5DDFB, 0}, {1, 18, 3052, 3053, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 6, 3054, 3055, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 5, 3056, 3057, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 3058, 3059, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 33, 3060, 3061, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 32, 3062, 3063, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 3064, 3065, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 35, 3066, -1, -12.3910f, 5.0270f, 0.5700f, 1.9700f, 0xCFFFC3, 0}, {2, 34, 3067, 3068, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3069, 3070, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 30, 3071, -1, -9.2170f, 5.6940f, 1.2300f, 0.4400f, 0xCFFFC3, 0}, {2, 36, 3072, -1, -12.9760f, 5.8120f, 0.6000f, 0.3000f, 0xCFFFC3, 0}, {2, 255, 3073, 3074, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3075, 3076, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 37, 3077, 3078, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 31, 3079, -1, -10.4130f, 5.6780f, 1.1700f, 0.5500f, 0xCFFFC3, 0}, {2, 29, 3080, 3081, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 28, 3082, 3083, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 27, 3084, 3085, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}
-#define MAP_PINS {{0, 0, 3007, -2.0390f, 7.7500f, 133, -1}, {0, 0, 3008, -1.6430f, 7.7500f, 137, -1}, {0, 0, 3009, -2.4700f, 7.7500f, 135, 122}, {0, 0, 3010, -1.2540f, 7.7600f, 135, 123}, {1, 1, 3014, -6.2100f, 7.6800f, 134, -1}, {2, 1, 3014, -1.3150f, 5.0920f, 134, -1}, {5, 0, 3008, 1.2400f, 4.4520f, 137, -1}, {5, 0, 3007, 1.6210f, 4.4490f, 133, -1}, {8, 0, 3024, -3.0697f, 6.4597f, 135, -1}, {10, 0, 3007, -0.3430f, 4.4060f, 133, -1}, {10, 0, 3028, -0.7200f, 4.3930f, 136, -1}, {21, 0, 3007, -1.6940f, 5.0880f, 133, -1}, {22, 0, 3051, 4.5530f, 3.3700f, 135, 124}, {22, 0, 3007, 4.9480f, 3.3820f, 133, -1}, {27, 1, 3014, -10.9970f, 6.6240f, 134, -1}, {28, 0, 3007, -11.2580f, 4.9690f, 133, -1}, {34, 0, 3007, -12.8160f, 5.7890f, 133, -1}, {34, 0, 3008, -13.1960f, 5.7970f, 137, -1}, {40, 0, 3007, -7.6610f, 6.0700f, 133, -1}}
-#define MAP_NEXT {{0, 3011, -1.0730f, 6.4850f, 180.0000f, 417, -1.0730f, 6.1870f, 1, -1}, {17, 3042, -5.2607f, 5.8454f, 90.0000f, 419, -5.5969f, 6.0434f, 2, 16}, {25, 3011, -1.0730f, 7.2500f, 0.0000f, 416, -1.0930f, 7.9120f, 1, -1}, {41, 3011, -4.5300f, 5.8450f, -90.0000f, 417, -4.1075f, 6.0470f, 0, 6}}
-#define MAP_NAMES {{0, -1, 415, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 416, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 417, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {1, 21, 420, 3.4800f, 5.6971f, 0xB5DCFB, 1, 0}, {2, -1, 419, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}
+#define STAG_SCENES_STR {137, 136, 138, 139}
+#define STAG_SCENES_ROOM {4, 19, 36, 32812}
+#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 419, 0x14u}, {2, 24, 130, -0.0400f, -7.8800f, 422, 0x400020u}, {26, 16, 131, 16.3100f, -7.8700f, 423, 0x40u}}
+#define MAP_ROOMS {{0, 1, 3006, 3007, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 0, 3013, 3014, -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, 127, 3016, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 3017, 3018, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 19, 3019, -1, 1.4650f, 4.4640f, 0.6500f, 0.3100f, 0xB5DDFB, 0}, {1, 255, 3020, 3021, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 15, 3022, 3023, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 9, 3024, -1, -3.0980f, 6.4880f, 1.1110f, 0.4800f, 0xB5DDFB, 0}, {1, 10, 3026, 3027, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 25, 3028, -1, -0.6440f, 4.4430f, 0.7000f, 0.3700f, 0xB5DDFB, 0}, {1, 14, 3030, 3031, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 20, 3032, 3033, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 17, 3034, 3035, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 16, 3036, 3037, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3038, 3039, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3040, 3041, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 26, 3042, -1, -3.7180f, 5.7650f, 2.3517f, 0.4300f, 0xB5DDFB, 0}, {1, 13, 3044, 3045, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 24, 3046, 3047, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 8, 3048, 3049, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 11, 3050, -1, -1.5030f, 5.1050f, 0.8500f, 0.8900f, 0xB5DDFB, 0}, {1, 21, 3051, -1, 3.7290f, 3.4460f, 2.4100f, 0.6600f, 0xB5DDFB, 0}, {1, 18, 3053, 3054, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 6, 3055, 3056, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 5, 3057, 3058, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 3059, 3060, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 33, 3061, 3062, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 32, 3063, 3064, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 3065, 3066, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 35, 3067, -1, -12.3910f, 5.0270f, 0.5700f, 1.9700f, 0xCFFFC3, 0}, {2, 34, 3068, 3069, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3070, 3071, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 30, 3072, -1, -9.2170f, 5.6940f, 1.2300f, 0.4400f, 0xCFFFC3, 0}, {2, 36, 3073, -1, -12.9760f, 5.8120f, 0.6000f, 0.3000f, 0xCFFFC3, 0}, {2, 255, 3074, 3075, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3076, 3077, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 37, 3078, 3079, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 31, 3080, -1, -10.4130f, 5.6780f, 1.1700f, 0.5500f, 0xCFFFC3, 0}, {2, 29, 3081, 3082, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 28, 3083, 3084, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 27, 3085, 3086, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}
+#define MAP_PINS {{0, 0, 3008, -2.0390f, 7.7500f, 133, -1}, {0, 0, 3009, -1.6430f, 7.7500f, 137, -1}, {0, 0, 3010, -2.4700f, 7.7500f, 135, 122}, {0, 0, 3011, -1.2540f, 7.7600f, 135, 123}, {1, 1, 3015, -6.2100f, 7.6800f, 134, -1}, {2, 1, 3015, -1.3150f, 5.0920f, 134, -1}, {5, 0, 3009, 1.2400f, 4.4520f, 137, -1}, {5, 0, 3008, 1.6210f, 4.4490f, 133, -1}, {8, 0, 3025, -3.0697f, 6.4597f, 135, -1}, {10, 0, 3008, -0.3430f, 4.4060f, 133, -1}, {10, 0, 3029, -0.7200f, 4.3930f, 136, -1}, {21, 0, 3008, -1.6940f, 5.0880f, 133, -1}, {22, 0, 3052, 4.5530f, 3.3700f, 135, 124}, {22, 0, 3008, 4.9480f, 3.3820f, 133, -1}, {27, 1, 3015, -10.9970f, 6.6240f, 134, -1}, {28, 0, 3008, -11.2580f, 4.9690f, 133, -1}, {34, 0, 3008, -12.8160f, 5.7890f, 133, -1}, {34, 0, 3009, -13.1960f, 5.7970f, 137, -1}, {40, 0, 3008, -7.6610f, 6.0700f, 133, -1}}
+#define MAP_NEXT {{0, 3012, -1.0730f, 6.4850f, 180.0000f, 418, -1.0730f, 6.1870f, 1, -1}, {17, 3043, -5.2607f, 5.8454f, 90.0000f, 420, -5.5969f, 6.0434f, 2, 16}, {25, 3012, -1.0730f, 7.2500f, 0.0000f, 417, -1.0930f, 7.9120f, 1, -1}, {41, 3012, -4.5300f, 5.8450f, -90.0000f, 418, -4.1075f, 6.0470f, 0, 6}}
+#define MAP_NAMES {{0, -1, 416, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 417, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 418, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {1, 21, 421, 3.4800f, 5.6971f, 0xB5DCFB, 1, 0}, {2, -1, 420, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}
#define MAP_QUICK_K 1.5500f
-#define MAP_SHADE {{3086, 0.0055f, -0.0110f, 178}, {3087, 0.0000f, 0.0000f, 255}}
-#define MAP_MARKERS {3088, 3089, 3090, 3091}
+#define MAP_SHADE {{3087, 0.0055f, -0.0110f, 178}, {3088, 0.0000f, 0.0000f, 255}}
+#define MAP_MARKERS {3089, 3090, 3091, 3092}
#define MAP_COMPASS_K 0.7000f
#define MAP_BG_A 0.4438f
#define MAP_TITLE {0.0000f, 7.5363f}
-#define MAP_TITLE_BACK {3092, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}
-#define MAP_NO_MAP {3093, 0.0000f, 0.9400f}
-#define MAP_NO_MAP_MSG {423, -0.0600f, -1.2932f}
-#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 424, 3094, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}
+#define MAP_TITLE_BACK {3093, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}
+#define MAP_NO_MAP {3094, 0.0000f, 0.9400f}
+#define MAP_NO_MAP_MSG {424, -0.0600f, -1.2932f}
+#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 425, 3095, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}
#define MAP_MSG_K 0.7000f
#define FIRSTMAP_BG_A 0.6410f
-#define FIRSTMAP_TEXTS {{425, 0.0000f, 5.0305f}, {182, 0.0000f, -0.8796f}, {426, 0.0000f, -3.2895f}, {427, 0.0000f, -4.6996f}}
-#define FIRSTMAP_PIECES {{3095, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3096, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3097, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}
-#define FIRSTMAP_KEY {428, 0.0900f, -2.3200f}
-#define MAP_WIDE {{{3098, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 429, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3099, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 430, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3100, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 431, {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 {{426, 0.0000f, 5.0305f}, {182, 0.0000f, -0.8796f}, {427, 0.0000f, -3.2895f}, {428, 0.0000f, -4.6996f}}
+#define FIRSTMAP_PIECES {{3096, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3097, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3098, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}
+#define FIRSTMAP_KEY {429, 0.0900f, -2.3200f}
+#define MAP_WIDE {{{3099, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 430, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3100, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 431, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3101, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 432, {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 {{3101, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3101, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3101, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3101, 17.1900f, -7.1700f, 1.0f, -90.0000f}}
-#define MAP_ACT_CONFIRM {{3102, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {432, 433, 433}}
-#define MAP_ACT_MARKER {{3102, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {434, 435, 436}}
-#define MAP_ACT_CANCEL {{3102, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {348, 348, 348}}
-#define MAP_ACT_CHANGE {{3102, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {437, 437, 437}}
-#define MAP_ACT_KEY {{3102, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {438, 439, 440}}
-#define MAP_KEY_BB {3103, 13.6200f, 3.4200f, 0.3781f, 1.0000f}
+#define MAP_PAN_ARROWS {{3102, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3102, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3102, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3102, 17.1900f, -7.1700f, 1.0f, -90.0000f}}
+#define MAP_ACT_CONFIRM {{3103, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {433, 434, 434}}
+#define MAP_ACT_MARKER {{3103, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {435, 436, 437}}
+#define MAP_ACT_CANCEL {{3103, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {348, 348, 348}}
+#define MAP_ACT_CHANGE {{3103, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {438, 438, 438}}
+#define MAP_ACT_KEY {{3103, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {439, 440, 441}}
+#define MAP_KEY_BB {3104, 13.6200f, 3.4200f, 0.3781f, 1.0000f}
#define MAP_KEY_STEP -0.8250f
-#define MAP_KEY_ROWS {{{3104, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 441, {12.7550f, -1.5413f, 15.3500f}}, {{3105, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 442, {12.7550f, -1.5413f, 15.3500f}}, {{3106, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 443, {12.7550f, -1.5413f, 15.3500f}}, {{3107, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 444, {12.7550f, -1.5413f, 15.3500f}}, {{3108, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 445, {12.7550f, -1.5413f, 15.3500f}}}
+#define MAP_KEY_ROWS {{{3105, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 442, {12.7550f, -1.5413f, 15.3500f}}, {{3106, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 443, {12.7550f, -1.5413f, 15.3500f}}, {{3107, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 444, {12.7550f, -1.5413f, 15.3500f}}, {{3108, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 445, {12.7550f, -1.5413f, 15.3500f}}, {{3109, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 446, {12.7550f, -1.5413f, 15.3500f}}}
#define MAP_KEY_FLAGS {133, 134, 135, 136, 137}
#define MAP_KEY_N 5
-#define MAP_MM_PIECES {{3109, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3110, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3111, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3112, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}
-#define MAP_MM_MARKERS {3113, 3114, 3115, 3116}
+#define MAP_MM_PIECES {{3110, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3111, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3112, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3113, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}
+#define MAP_MM_MARKERS {3114, 3115, 3116, 3117}
#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 {3117, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}
+#define MAP_MM_PLACE {3118, 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 446
+#define TXT_KEY_SHIFT 447
#define ROOM_ZONES {2, 4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 22, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6}
#define MSG_FIREBALL 0
#define MSG_DASH 1
diff --git a/games/hollowknight/src/data_fw.bin b/games/hollowknight/src/data_fw.bin
index 4bcc0a27..0641fc44 100644
Binary files a/games/hollowknight/src/data_fw.bin and b/games/hollowknight/src/data_fw.bin differ
diff --git a/games/hollowknight/src/data_fw.h b/games/hollowknight/src/data_fw.h
index 3b6b3fbf..fa21fcbc 100644
--- a/games/hollowknight/src/data_fw.h
+++ b/games/hollowknight/src/data_fw.h
@@ -18,7 +18,7 @@
#define SEC_HEADS 15
#define SEC_VM 16
#define SEC_VMDEF 17
-#define NUM_ROOMS 4
+#define NUM_ROOMS 7
#define ROOM_BASE 38
#define HK_PART_N 2
#define CROSS_HOME_ROOM 0
@@ -28,6 +28,9 @@
#define ROOM_FUNGUS2_06 1
#define ROOM_FUNGUS2_05 2
#define ROOM_FUNGUS2_04 3
+#define ROOM_FUNGUS2_03 4
+#define ROOM_FUNGUS2_01 5
+#define ROOM_FUNGUS2_02 6
#define CLIP_KNIGHT_IDLE 0
#define CLIP_KNIGHT_IDLE_HURT 1
#define CLIP_KNIGHT_IDLE_WIND 2
@@ -578,13 +581,25 @@
#define CLIP_BULLET_SHOCKWAVE_SPURT 547
#define CLIP_GLOB_IDLE 548
#define CLIP_GLOB_LAND 549
-#define SPRITE_HERO_LIGHT 2253
-#define SPRITE_DIALOGUE_BACKBOARD 2254
-#define SPRITE_PROMPT_SHADOW 2255
-#define SPRITE_CORPSE_NAIL 2256
-#define SPRITE_FK_BARREL 2257
-#define SPRITE_FK_STAFF 2258
-#define SPRITE_DIGIT0 2501
+#define CLIP_VM0_ARRIVE 550
+#define CLIP_VM0_ARRIVE_SMOKE 551
+#define CLIP_VM0_IDLE 552
+#define CLIP_VM1_BELL_IDLE 553
+#define CLIP_VM1_BELL_RING_R 554
+#define CLIP_VM1_BELL_STAND 555
+#define CLIP_VM1_BELL_STAND_APPEAR 556
+#define CLIP_VM1_BOX_DISAPPEAR 557
+#define CLIP_VM1_BOX_IDLE 558
+#define CLIP_VM1_FRONT 559
+#define CLIP_VM1_GRATE_DISAPPEAR 560
+#define CLIP_VM1_GRATE_IDLE 561
+#define SPRITE_HERO_LIGHT 2434
+#define SPRITE_DIALOGUE_BACKBOARD 2435
+#define SPRITE_PROMPT_SHADOW 2436
+#define SPRITE_CORPSE_NAIL 2437
+#define SPRITE_FK_BARREL 2438
+#define SPRITE_FK_STAFF 2439
+#define SPRITE_DIGIT0 2697
#define STYLE_DIALOGUE 0
#define STYLE_PROMPT 1
#define STYLE_TITLE_L 2
@@ -642,20 +657,20 @@
#define EK_SPORG 37
#define NUM_KINDS 38
#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 198, 197, -1, -1, -1, -1, -1, -1, -1, -1, 200, 201}}, {EF_BUZZER, {203, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 205, 206}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 213, 212, -1, -1, -1, -1, -1, -1, -1, 210, 211}}, {EF_BOUNCER, {-1, -1, -1, 216, -1, -1, -1, -1, -1, -1, -1, 214, 215}}, {EF_SPITTER, {-1, -1, -1, 219, 220, 218, -1, -1, -1, -1, -1, 217, -1}}, {EF_ROLLER, {223, -1, -1, 225, 224, 226, -1, -1, -1, -1, -1, 221, 222}}, {EF_BLOCKER, {233, -1, -1, 229, 234, 227, 228, 235, 236, 232, 231, -1, 230}}, {EF_HUSK, {242, 243, 244, 237, 239, 238, -1, -1, -1, -1, -1, 240, 241}}, {EF_HUSK, {250, 251, 252, 245, 247, 246, -1, -1, -1, -1, -1, 248, 249}}, {EF_HUSK, {258, 259, 260, 253, 255, 254, -1, -1, -1, -1, -1, 256, 257}}, {EF_HUSK, {266, 267, 268, 261, 263, 262, -1, -1, -1, -1, -1, 264, 265}}, {EF_LEAPER, {272, 274, 275, 269, 273, -1, -1, -1, -1, -1, -1, 270, 271}}, {EF_GUARD, {281, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 278, 279}}, {EF_FK, {303, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 301}}, {EF_FKHEAD, {323, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 321}}, {EF_HATCHER, {-1, -1, -1, 328, 327, -1, -1, -1, -1, -1, -1, 325, 326}}, {EF_HATCHLING, {-1, -1, -1, 329, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {335, -1, -1, 333, 334, 337, 336, 330, -1, -1, -1, 331, 332}}, {EF_GFLY, {350, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 359, 360, 358, 354, 355, -1, -1, -1, -1, -1, 356, 357}}, {EF_PIGEON, {-1, -1, -1, 362, 363, 364, 361, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {366, -1, -1, 369, 368, 367, -1, -1, -1, -1, -1, 365, -1}}, {EF_SHAKER, {373, 374, 375, 370, -1, -1, -1, -1, -1, -1, -1, 371, 372}}, {EF_MOSQUITO, {380, -1, -1, 382, 381, 377, 376, -1, -1, -1, -1, 378, 379}}, {EF_FATFLY, {386, -1, -1, 383, -1, -1, -1, -1, -1, -1, -1, 384, 385}}, {EF_MOSSCHARGER, {-1, -1, -1, 387, 388, 391, 394, 393, 395, 392, -1, 389, 390}}, {EF_MOSSKNIGHT, {401, 416, 420, -1, -1, -1, -1, -1, -1, -1, -1, 396, 397}}, {EF_HORNET, {436, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 424, -1}}, {EF_MENDER, {460, -1, -1, 461, 459, -1, -1, -1, -1, -1, -1, 457, 458}}, {EF_FUNGLING, {463, -1, -1, 464, -1, -1, -1, -1, -1, -1, -1, 462, -1}}, {EF_AMBLOOM, {-1, 467, 468, -1, -1, -1, -1, -1, -1, -1, -1, 465, 466}}, {EF_FUNGOON, {471, -1, -1, 473, 472, 474, 470, -1, -1, -1, -1, 469, -1}}, {EF_SHRUMELING, {477, -1, -1, 485, 484, -1, -1, -1, -1, -1, -1, 475, 476}}, {EF_SHAKER, {489, 490, 491, 486, -1, -1, -1, -1, -1, -1, -1, 487, 488}}, {EF_OGRE, {495, 500, -1, 501, 499, 492, 497, 498, 493, 496, -1, 494, -1}}, {EF_SPORG, {505, -1, -1, 508, 502, 507, -1, -1, -1, -1, -1, 503, -1}}}
-#define TXT_PROMPT_LISTEN 0
-#define TXT_PROMPT_REST 1
-#define TXT_PROMPT_INSPECT 2
-#define TXT_PROMPT_ENTER 3
-#define TXT_PROMPT_SIT 4
-#define TXT_PROMPT_SHOP 5
-#define TXT_PROMPT_TRAVEL 6
-#define TXT_PROMPT_ASCEND 7
-#define TXT_PROMPT_DESCEND 8
-#define TXT_PROMPT_EXIT 9
-#define TXT_PROMPT_ACCEPT 10
-#define TXT_PROMPT_TRADE 11
-#define TXT_PROMPT_WATCH 12
-#define TXT_PROMPT_CHALLENGE 13
+#define TXT_PROMPT_LISTEN 19
+#define TXT_PROMPT_REST 20
+#define TXT_PROMPT_INSPECT 21
+#define TXT_PROMPT_ENTER 22
+#define TXT_PROMPT_SIT 23
+#define TXT_PROMPT_SHOP 24
+#define TXT_PROMPT_TRAVEL 25
+#define TXT_PROMPT_ASCEND 26
+#define TXT_PROMPT_DESCEND 27
+#define TXT_PROMPT_EXIT 28
+#define TXT_PROMPT_ACCEPT 29
+#define TXT_PROMPT_TRADE 30
+#define TXT_PROMPT_WATCH 31
+#define TXT_PROMPT_CHALLENGE 32
#define PROMPT_SORT 884737u
#define DIGIT_ADV {0.4138f, 0.4138f, 0.4138f, 0.4138f, 0.4138f, 0.4138f, 0.4138f, 0.4138f, 0.4138f, 0.4138f}
#define VMOP_NOP 1
@@ -843,21 +858,21 @@
#define VMEV_FIRST_MAP_UP 44
#define VMEV_FIRST_MAP_DOWN 45
#define VMEV_FK_RAGE_COMPLETE 46
-#define VMEV_UPDATE_SHAMAN {255, 255, 255, 255}
-#define VMEV_SHOP_REGION_INACTIVE {255, 255, 255, 255}
-#define VMEV_SHOP_REGION_ACTIVE {255, 255, 255, 255}
-#define VMSTR_NPC_TITLE 11
-#define VMSTR_VISITED 12
-#define VMSTR_DISPLAY_RIGHT 13
-#define VMSTR_HORNET_SAVER 14
-#define VMSTR_ITEM 15
+#define VMEV_UPDATE_SHAMAN {255, 255, 255, 255, 255, 255, 255}
+#define VMEV_SHOP_REGION_INACTIVE {255, 255, 255, 255, 255, 255, 255}
+#define VMEV_SHOP_REGION_ACTIVE {255, 255, 255, 255, 255, 255, 255}
+#define VMSTR_NPC_TITLE 19
+#define VMSTR_VISITED 98
+#define VMSTR_DISPLAY_RIGHT 99
+#define VMSTR_HORNET_SAVER 100
+#define VMSTR_ITEM 101
#define STR_ATTACK_RANGE 15
-#define STR_EVADE_RANGE 16
-#define STR_SPIT_RANGE 17
-#define STR_WAKE_BOX 18
-#define STR_SLASH_HITBOX 19
-#define STR_SLASH2_HITBOX 20
-#define STR_DOOR_STAGEXIT 21
+#define STR_EVADE_RANGE 21
+#define STR_SPIT_RANGE 22
+#define STR_WAKE_BOX 23
+#define STR_SLASH_HITBOX 24
+#define STR_SLASH2_HITBOX 25
+#define STR_DOOR_STAGEXIT 19
#define STR_SMASH_HITS 13
#define TITLE_KINGSPASS 0
#define TITLE_DIRTMOUTH 1
@@ -886,76 +901,76 @@
#define TITLE_RUINS 24
#define TITLE_MAGE_TOWER 25
#define NUM_TITLES 26
-#define TITLE_TABLE {{15, 16, -1, -1}, {17, 18, 19, -1}, {20, 21, -1, 22}, {23, 24, -1, 25}, {26, 27, -1, 28}, {29, 30, -1, -1}, {31, 32, 33, -1}, {34, 35, -1, -1}, {36, 37, -1, -1}, {38, 39, -1, -1}, {40, 41, -1, -1}, {42, 43, -1, -1}, {44, 45, -1, -1}, {46, 47, -1, -1}, {48, 49, -1, 50}, {51, 52, -1, 53}, {51, 52, -1, 54}, {55, 56, 57, -1}, {55, 56, -1, -1}, {58, 59, -1, 60}, {61, 62, -1, 63}, {64, 65, -1, 66}, {67, 68, -1, 69}, {70, 71, -1, 63}, {72, 73, -1, -1}, {74, 75, 76, -1}}
-#define SPRITE_FLEUR_TOP 2259
+#define TITLE_TABLE {{34, 35, -1, -1}, {36, 37, 38, -1}, {39, 40, -1, 41}, {42, 43, -1, 44}, {45, 46, -1, 47}, {48, 49, -1, -1}, {50, 51, 52, -1}, {53, 54, -1, -1}, {55, 56, -1, -1}, {57, 58, -1, -1}, {59, 60, -1, -1}, {61, 62, -1, -1}, {63, 64, -1, -1}, {65, 66, -1, -1}, {67, 68, -1, 69}, {70, 71, -1, 72}, {70, 71, -1, 73}, {74, 75, 76, -1}, {74, 75, -1, -1}, {77, 78, -1, 79}, {80, 81, -1, 82}, {83, 84, -1, 85}, {86, 87, -1, 88}, {89, 90, -1, 82}, {91, 92, -1, -1}, {93, 94, 95, -1}}
+#define SPRITE_FLEUR_TOP 2440
#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 2260
+#define SPRITE_FLEUR_BOT 2441
#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 2253
-#define SPRITE_MSG_BG 2261
-#define SPRITE_MSG_STOP 2262
-#define SPRITE_MSG_FLEUR 2263
-#define SPRITE_MSG_KEY 2264
-#define SPRITE_MSG_ICON_FIREBALL 2265
-#define SPRITE_MSG_ICON_DASH 2266
-#define SPRITE_GRASS_BALL 2267
-#define SPRITE_GAS 2268
-#define SPRITE_GAS_FLASH 2269
-#define SPRITE_SOUL_ORB 2270
+#define VM_PIECE_BASE 2434
+#define SPRITE_MSG_BG 2442
+#define SPRITE_MSG_STOP 2443
+#define SPRITE_MSG_FLEUR 2444
+#define SPRITE_MSG_KEY 2445
+#define SPRITE_MSG_ICON_FIREBALL 2446
+#define SPRITE_MSG_ICON_DASH 2447
+#define SPRITE_GRASS_BALL 2448
+#define SPRITE_GAS 2449
+#define SPRITE_GAS_FLASH 2450
+#define SPRITE_SOUL_ORB 2451
#define SOUL_ORB_SORT {13, 0}
-#define MSG_TABLE {{77, 78, 79, 80, 81, 82}, {83, 84, 85, 86, 87, 88}}
-#define NOTICE_BACKBOARD {2271, 1.0000f, 0.6931f}
-#define TUTE_FLEUR {2263, 1.0000f, 1.0000f}
-#define TUTE_BACKBOARD {2272, 1.0000f, 0.9560f}
-#define TUTE_IMAGE {2273, 1.0000f, 1.0000f}
-#define TUTE_STOP {2262, 1.0000f, 1.0000f}
-#define FOCUS_PROMPT_BG {2274, 0.0000f, -1.7900f, 1.0000f, 1.0000f}
-#define FOCUS_PROMPT_TEXTS {{89, 0.1765f, -2.3773f, 0}, {90, 0.1765f, -3.1983f, 0}, {91, -0.0488f, -4.1348f, 1}, {92, 0.2240f, -5.2114f, 0}}
-#define FOCUS_PROMPT_KEY {82, 0.4659f, -4.4341f}
+#define MSG_TABLE {{96, 97, 98, 99, 100, 101}, {102, 103, 104, 105, 106, 107}}
+#define NOTICE_BACKBOARD {2452, 1.0000f, 0.6931f}
+#define TUTE_FLEUR {2444, 1.0000f, 1.0000f}
+#define TUTE_BACKBOARD {2453, 1.0000f, 0.9560f}
+#define TUTE_IMAGE {2454, 1.0000f, 1.0000f}
+#define TUTE_STOP {2443, 1.0000f, 1.0000f}
+#define FOCUS_PROMPT_BG {2455, 0.0000f, -1.7900f, 1.0000f, 1.0000f}
+#define FOCUS_PROMPT_TEXTS {{108, 0.1765f, -2.3773f, 0}, {109, 0.1765f, -3.1983f, 0}, {110, -0.0488f, -4.1348f, 1}, {111, 0.2240f, -5.2114f, 0}}
+#define FOCUS_PROMPT_KEY {101, 0.4659f, -4.4341f}
#define NOTICE_ICONS {-1}
#define CHARM_ICON_K 1.5000f
-#define CHARM_ICONS {-1, 2275, 2276, 2277, 2278, -1, 2279, 2280, 2281, -1, -1, -1, -1, -1, 2282, -1, -1, -1, 2283, 2284, 2285, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define CHARM_NAMES {-1, 93, 94, 95, 96, -1, 97, 98, 99, -1, -1, -1, -1, -1, 100, -1, -1, -1, 101, 102, 103, -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 104
-#define TXT_CHARM_TUTE_SUB 105
-#define TXT_CHARM_REMINDER 106
-#define TXT_YN_YES 107
-#define TXT_YN_NO 108
-#define TXT_YN_NOT_ENOUGH 109
-#define MENU_LOGO {2286, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CHARM_ICONS {-1, 2456, 2457, 2458, 2459, -1, 2460, 2461, 2462, -1, -1, -1, -1, -1, 2463, -1, -1, -1, 2464, 2465, 2466, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CHARM_NAMES {-1, 112, 113, 114, 115, -1, 116, 117, 118, -1, -1, -1, -1, -1, 119, -1, -1, -1, 120, 121, 122, -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 123
+#define TXT_CHARM_TUTE_SUB 124
+#define TXT_CHARM_REMINDER 125
+#define TXT_YN_YES 126
+#define TXT_YN_NO 127
+#define TXT_YN_NOT_ENOUGH 128
+#define MENU_LOGO {2467, 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 {2287, 0.0000f, 0.0000f, 1.0023f, 1.0000f}
+#define MENU_POINTER {2468, 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 {2288, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
+#define MENU_PROFILES_FLEUR {2469, 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, {2289, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2290, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2291, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2292, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {9, {2293, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2294, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {24, {2295, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {35, {2296, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
+#define MENU_SLOT_ZONES {{2, {2470, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2471, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2472, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2473, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {9, {2474, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2475, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {24, {2476, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {35, {2477, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
#define MENU_SLOT_NZONES 8
#define MENU_SLOT_BG_DY 0.0102f
-#define MENU_SLOT_FLEUR {2297, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_FLEUR {2478, 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 {2298, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_SELECTOR {2479, 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 {2299, 0.0000f, 0.0000f, 1.0000f, 1.0025f}
+#define MENU_SLOT_CURSOR {2480, 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 {2300, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_ORB {2481, 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 {2301, 0.0000f, 0.0000f, 1.0039f, 1.0000f}
+#define MENU_SLOT_GEO {2482, 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 {2302, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_HEALTH {2483, 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
@@ -973,80 +988,80 @@
#define MENU_SLOT_YES_X 2.5813f
#define MENU_SLOT_NO_X 6.2296f
#define MENU_BACK_Y -5.5406f
-#define MENU_PAUSE_TOP {2303, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_TOP {2484, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_PAUSE_TOP_Y 2.3653f
-#define MENU_PAUSE_BOT {2304, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_BOT {2485, 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 {2288, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
+#define MENU_KEYS_FLEUR {2469, 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
#define MENU_KEYS_BUTTON_Y -5.8306f
-#define TXT_MAIN_START 110
-#define TXT_MAIN_QUIT 111
-#define TXT_PROFILE_NEW_GAME 112
-#define TXT_PROFILE_CLEAR_BUTTON 113
-#define TXT_PROFILE_CLEAR_PROMPT 114
-#define TXT_NAV_YES 115
-#define TXT_NAV_NO 116
-#define TXT_NAV_BACK 117
-#define TXT_PAUSE_CONTINUE 118
-#define TXT_PAUSE_MAIN 119
-#define TXT_PROFILE_CORRUPTED 120
-#define TXT_PROFILE_LOADING 121
-#define TXT_SCREEN_SAVE_PROFILES 122
-#define TXT_SCREEN_KEYBOARD 123
-#define MENU_KEYS {{124, 135}, {125, 136}, {126, 137}, {127, 138}, {128, 139}, {129, 140}, {130, 141}, {131, 142}, {132, 143}, {133, 144}, {134, 145}}
+#define TXT_MAIN_START 129
+#define TXT_MAIN_QUIT 130
+#define TXT_PROFILE_NEW_GAME 131
+#define TXT_PROFILE_CLEAR_BUTTON 132
+#define TXT_PROFILE_CLEAR_PROMPT 133
+#define TXT_NAV_YES 134
+#define TXT_NAV_NO 135
+#define TXT_NAV_BACK 136
+#define TXT_PAUSE_CONTINUE 137
+#define TXT_PAUSE_MAIN 138
+#define TXT_PROFILE_CORRUPTED 139
+#define TXT_PROFILE_LOADING 140
+#define TXT_SCREEN_SAVE_PROFILES 141
+#define TXT_SCREEN_KEYBOARD 142
+#define MENU_KEYS {{143, 154}, {144, 155}, {145, 156}, {146, 157}, {147, 158}, {148, 159}, {149, 160}, {150, 161}, {151, 162}, {152, 163}, {153, 164}}
#define MENU_NKEYS 11
-#define TXT_HELP 146
-#define TXT_HELP_TITLE 147
-#define TXT_NEXT 148
-#define TXT_HELP_LINES 149
-#define TXT_ZONES {150, 151, 152, 153, 154, 155, 156, 157}
-#define TXT_CROSS_TO 158
-#define TXT_CROSS_APPS {159, 160}
+#define TXT_HELP 165
+#define TXT_HELP_TITLE 166
+#define TXT_NEXT 167
+#define TXT_HELP_LINES 168
+#define TXT_ZONES {169, 170, 171, 172, 173, 174, 175, 176}
+#define TXT_CROSS_TO 177
+#define TXT_CROSS_APPS {178, 179}
#define CROSS_NAPPS 2
-#define TXT_CROSS_SAVED 161
-#define TXT_CROSS_NEW 162
+#define TXT_CROSS_SAVED 180
+#define TXT_CROSS_NEW 181
#define INV_X -4.0500f
#define INV_Y 7.5500f
-#define INV_BORDER {{2305, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2305, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2306, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2307, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2308, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2309, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
+#define INV_BORDER {{2486, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2486, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2487, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2488, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2489, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2490, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
#define INV_NBORDER 6
-#define INV_FRAME {2310, 4.0479f, -7.1963f, 1.0f, 1.0f}
-#define INV_ARROW_L {2311, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
-#define INV_ARROW_R {2311, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_L {2312, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_R {2312, 18.0400f, -0.4300f, 1.0000f, 1.0000f}
+#define INV_FRAME {2491, 4.0479f, -7.1963f, 1.0f, 1.0f}
+#define INV_ARROW_L {2492, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
+#define INV_ARROW_R {2492, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_L {2493, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_R {2493, 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 {165, 166, 167, 168}
-#define CH_BB {2313, -7.9200f, -8.3700f, 1.0000f, 1.0000f}
+#define TXT_INV_PANES {184, 185, 186, 187}
+#define CH_BB {2494, -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 {2314, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
+#define CH_GLOW {2495, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
#define CH_GLOW_A 0.6970f
-#define CH_ICONS {-1, 2275, 2276, 2277, 2278, -1, 2279, 2280, 2281, -1, -1, -1, -1, -1, 2282, -1, -1, -1, 2283, 2284, 2285, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define CH_NEXT_DOT {2315, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_ICONS {-1, 2456, 2457, 2458, 2459, -1, 2460, 2461, 2462, -1, -1, -1, -1, -1, 2463, -1, -1, -1, 2464, 2465, 2466, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CH_NEXT_DOT {2496, 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 {2316, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
-#define CH_NOTCH_EMPTY {2317, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_FULL {2497, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_EMPTY {2498, 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 {2318, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
+#define CH_DIVIDER {2499, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}
-#define CH_COST_PIP {2316, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_COST_PIP {2497, 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
@@ -1055,60 +1070,60 @@
#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 {2319, 16.3208f, -13.2878f, 1.0f, 1.0f}
+#define CH_CONFIRM_KEY {2500, 16.3208f, -13.2878f, 1.0f, 1.0f}
#define CH_CONFIRM_KEY_W 0.6412f
-#define CH_CURSOR {2320, 0.0000f, 0.0000f, 1.0000f, 0.9756f}
+#define CH_CURSOR {2501, 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 169
-#define TXT_CHARM_TXT_OVERCHARMED 170
-#define TXT_CHARM_TXT_COST 171
-#define TXT_CTRL_EQUIP 172
-#define TXT_CTRL_UNEQUIP 173
-#define TXT_CHARM_ALERT_NONE 174
-#define TXT_CHARM_ALERT_NONE_BENCH 175
-#define TXT_CHARM_NOTCHES 176
-#define TXT_CHARM_NAMES_INV {-1, 177, 178, 179, 180, -1, 181, 182, 183, -1, -1, -1, -1, -1, 184, -1, -1, -1, 185, 186, 187, -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, 188, 189, 190, 191, -1, 192, 193, 194, -1, -1, -1, -1, -1, 195, -1, -1, -1, 196, 197, 198, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define TXT_KEY_OK 199
-#define TXT_CHARM_BENCH 200
-#define INV_FIXED {{2321, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2322, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2323, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2324, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2325, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2326, -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}, {2327, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2328, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}
+#define TXT_CHARM_TXT_EQUIPPED 188
+#define TXT_CHARM_TXT_OVERCHARMED 189
+#define TXT_CHARM_TXT_COST 190
+#define TXT_CTRL_EQUIP 191
+#define TXT_CTRL_UNEQUIP 192
+#define TXT_CHARM_ALERT_NONE 193
+#define TXT_CHARM_ALERT_NONE_BENCH 194
+#define TXT_CHARM_NOTCHES 195
+#define TXT_CHARM_NAMES_INV {-1, 196, 197, 198, 199, -1, 200, 201, 202, -1, -1, -1, -1, -1, 203, -1, -1, -1, 204, 205, 206, -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, 207, 208, 209, 210, -1, 211, 212, 213, -1, -1, -1, -1, -1, 214, -1, -1, -1, 215, 216, 217, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define TXT_KEY_OK 218
+#define TXT_CHARM_BENCH 219
+#define INV_FIXED {{2502, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2503, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2504, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2505, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2506, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2507, -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}, {2508, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2509, -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 {{2329, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2330, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2331, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2332, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
-#define INV_VESSEL_PIECES {{2333, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2334, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2335, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}
+#define INV_HEART_PIECES {{2510, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2511, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2512, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2513, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
+#define INV_VESSEL_PIECES {{2514, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2515, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2516, -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 {{2336, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2337, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2338, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2339, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2340, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2341, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}
+#define INV_EQ {{2517, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2518, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2519, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2520, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2521, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2522, 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 {{2342, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2343, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2344, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2345, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}
+#define INV_TRINKETS {{2523, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2524, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2525, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2526, 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 {2346, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
-#define INV_DIVIDERS {{2347, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2347, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}
+#define INV_TRINKET_BB {2527, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
+#define INV_DIVIDERS {{2528, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2528, 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 {{201, 202}, {203, 204}, {205, 206}, {203, 207}, {203, 208}, {209, 210}}
-#define TXT_INV_VESSEL {{201, 202}, {211, 212}, {213, 214}, {211, 215}, {216, 217}}
-#define TXT_INV_FIXED {{218, 219}, {220, 221}, {222, 223}, {224, 225}}
-#define TXT_INV_EQ {{226, 227}, {228, 229}, {230, 231}, {232, 233}, {234, 235}, {236, 237}}
-#define TXT_INV_QUILL {238, 239, 240, 241}
-#define TXT_INV_TRINKETS {{242, 243}, {244, 245}, {246, 247}, {248, 249}}
-#define SHOP_BACKBOARD {2348, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
-#define SHOP_MASK_TOP {2349, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
-#define SHOP_MASK_BOTTOM {2350, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
-#define SHOP_ARROW_U {2351, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
-#define SHOP_ARROW_D {2351, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
-#define SHOP_SELECTOR {2352, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
-#define SHOP_CONFIRM_GEO {2353, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
-#define SHOP_POINTER_L {2354, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
-#define SHOP_POINTER_R {2354, 6.6249f, -2.0798f, -1.0000f, 1.0000f}
+#define TXT_INV_HEART {{220, 221}, {222, 223}, {224, 225}, {222, 226}, {222, 227}, {228, 229}}
+#define TXT_INV_VESSEL {{220, 221}, {230, 231}, {232, 233}, {230, 234}, {235, 236}}
+#define TXT_INV_FIXED {{237, 238}, {239, 240}, {241, 242}, {243, 244}}
+#define TXT_INV_EQ {{245, 246}, {247, 248}, {249, 250}, {251, 252}, {253, 254}, {255, 256}}
+#define TXT_INV_QUILL {257, 258, 259, 260}
+#define TXT_INV_TRINKETS {{261, 262}, {263, 264}, {265, 266}, {267, 268}}
+#define SHOP_BACKBOARD {2529, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
+#define SHOP_MASK_TOP {2530, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
+#define SHOP_MASK_BOTTOM {2531, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
+#define SHOP_ARROW_U {2532, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
+#define SHOP_ARROW_D {2532, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
+#define SHOP_SELECTOR {2533, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
+#define SHOP_CONFIRM_GEO {2534, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_L {2535, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_R {2535, 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 251
+#define TXT_KEY_BACK 270
#define SHOP_BACKBOARD_A 0.8910f
#define SHOP_BORDERS {{5.1437f, 3.6600f, 1.1244f, 1.0000f, CLIP_SHOPUI_SHOP_MENU_TOP_UP, CLIP_SHOPUI_SHOP_MENU_TOP_DOWN, 0.0000f}, {5.1937f, -5.7000f, 1.1338f, 1.0000f, CLIP_SHOPUI_SHOP_MENU_BOTTOM_UP, CLIP_SHOPUI_SHOP_MENU_BOTTOM_DOWN, 0.0000f}}
#define SHOP_FIGUREHEADS {{5.1437f, 6.6400f, 1.0000f, 1.0000f, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_UP, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_DOWN, 0.3500f}, {5.1437f, 6.7400f, 1.0000f, 1.0000f, CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_UP, CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_DOWN, 0.3500f}, {5.1437f, 6.8300f, 1.0000f, 1.0000f, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_UP, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_DOWN, 0.3500f}}
@@ -1125,7 +1140,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 {2355, 5.5100f, 2.5800f, 1.0000f, 1.0000f}
+#define SHOP_PEG {2536, 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}
@@ -1136,24 +1151,24 @@
#define SHOP_ROW_TOP 4.9000f
#define SHOP_ROW_BOTTOM -5.2500f
#define SHOP_ARROW_BOB 0.1500f
-#define TXT_SHOP_CTRL_BUY 254
-#define TXT_SHOP_CTRL_EXIT 255
-#define TXT_SHOP_CTRL_CONFIRM 256
-#define TXT_SHOP_CTRL_CANCEL 257
-#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 258
-#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 259
-#define TXT_SHOP_CHARM_TXT_NOTCHCOST 260
-#define TXT_SHOP_YES 261
-#define TXT_SHOP_NO 262
+#define TXT_SHOP_CTRL_BUY 273
+#define TXT_SHOP_CTRL_EXIT 274
+#define TXT_SHOP_CTRL_CONFIRM 275
+#define TXT_SHOP_CTRL_CANCEL 276
+#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 277
+#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 278
+#define TXT_SHOP_CHARM_TXT_NOTCHCOST 279
+#define TXT_SHOP_YES 280
+#define TXT_SHOP_NO 281
#define SHOP_DESC_BOTTOM -5.0500f
-#define SHOP_ITEMS {{2357, 0.5714f, 263, 264, 150, 1, 125, -1, 0, 0}, {2357, 0.5714f, 263, 265, 500, 1, 126, 125, 0, 0}, {2358, 0.5714f, 266, 267, 550, 3, 127, -1, 0, 0}, {2359, 0.5714f, 268, 269, 950, 10, 128, -1, 0, 0}, {2360, 0.5714f, 270, 271, 300, 2, 37, -1, 0, 1}, {2361, 0.5714f, 272, 273, 200, 2, 40, -1, 0, 4}, {2362, 0.5714f, 274, 275, 1800, 0, 119, -1, 0, 0}, {2363, 0.5714f, 276, 277, 60, 11, 129, -1, 0, 0}, {2364, 0.5714f, 278, 279, 220, 2, 38, -1, 0, 2}, {2365, 0.5714f, 280, 281, 120, 0, 2, -1, 0, 0}, {2366, 0.5714f, 282, 283, 40, 9, 130, 10, 0, 0}, {2366, 0.5714f, 284, 285, 80, 9, 131, 28, 0, 0}, {2367, 0.5714f, 286, 287, 100, 16, 133, -1, 0, 0}, {2368, 0.5714f, 288, 289, 100, 16, 134, -1, 0, 0}, {2369, 0.5714f, 290, 291, 100, 16, 135, -1, 0, 0}, {2370, 0.5714f, 292, 293, 100, 16, 137, 147, 0, 0}, {2371, 0.5714f, 294, 295, 100, 16, 136, -1, 0, 0}, {2372, 0.5714f, 296, 297, 100, 17, 139, -1, 0, 0}, {2373, 0.5714f, 298, 299, 100, 17, 140, -1, 0, 0}, {2374, 0.5714f, 300, 301, 100, 17, 141, 14, 0, 0}, {2375, 0.5714f, 302, 303, 210, 17, 142, 14, 0, 0}, {2376, 0.5714f, 304, 305, 250, 2, 44, -1, 0, 8}, {2377, 0.5714f, 306, 307, 300, 2, 54, -1, 0, 18}, {2378, 0.5714f, 308, 309, 120, 2, 50, -1, 0, 14}, {2379, 0.5714f, 310, 311, 220, 2, 55, -1, 0, 19}, {2380, 0.5714f, 312, 313, 800, 2, 43, -1, 0, 7}, {2381, 0.5714f, 314, 315, 120, 8, 143, -1, 5, 0}, {2381, 0.5714f, 314, 315, 500, 8, 144, -1, 10, 0}, {2381, 0.5714f, 314, 315, 900, 8, 145, -1, 18, 0}, {2381, 0.5714f, 314, 316, 1400, 8, 146, -1, 25, 0}}
+#define SHOP_ITEMS {{2538, 0.5714f, 282, 283, 150, 1, 125, -1, 0, 0}, {2538, 0.5714f, 282, 284, 500, 1, 126, 125, 0, 0}, {2539, 0.5714f, 285, 286, 550, 3, 127, -1, 0, 0}, {2540, 0.5714f, 287, 288, 950, 10, 128, -1, 0, 0}, {2541, 0.5714f, 289, 290, 300, 2, 37, -1, 0, 1}, {2542, 0.5714f, 291, 292, 200, 2, 40, -1, 0, 4}, {2543, 0.5714f, 293, 294, 1800, 0, 119, -1, 0, 0}, {2544, 0.5714f, 295, 296, 60, 11, 129, -1, 0, 0}, {2545, 0.5714f, 297, 298, 220, 2, 38, -1, 0, 2}, {2546, 0.5714f, 299, 300, 120, 0, 2, -1, 0, 0}, {2547, 0.5714f, 301, 302, 40, 9, 130, 10, 0, 0}, {2547, 0.5714f, 303, 304, 80, 9, 131, 28, 0, 0}, {2548, 0.5714f, 305, 306, 100, 16, 133, -1, 0, 0}, {2549, 0.5714f, 307, 308, 100, 16, 134, -1, 0, 0}, {2550, 0.5714f, 309, 310, 100, 16, 135, -1, 0, 0}, {2551, 0.5714f, 311, 312, 100, 16, 137, 147, 0, 0}, {2552, 0.5714f, 313, 314, 100, 16, 136, -1, 0, 0}, {2553, 0.5714f, 315, 316, 100, 17, 139, -1, 0, 0}, {2554, 0.5714f, 317, 318, 100, 17, 140, -1, 0, 0}, {2555, 0.5714f, 319, 320, 100, 17, 141, 14, 0, 0}, {2556, 0.5714f, 321, 322, 210, 17, 142, 14, 0, 0}, {2557, 0.5714f, 323, 324, 250, 2, 44, -1, 0, 8}, {2558, 0.5714f, 325, 326, 300, 2, 54, -1, 0, 18}, {2559, 0.5714f, 327, 328, 120, 2, 50, -1, 0, 14}, {2560, 0.5714f, 329, 330, 220, 2, 55, -1, 0, 19}, {2561, 0.5714f, 331, 332, 800, 2, 43, -1, 0, 7}, {2562, 0.5714f, 333, 334, 120, 8, 143, -1, 5, 0}, {2562, 0.5714f, 333, 334, 500, 8, 144, -1, 10, 0}, {2562, 0.5714f, 333, 334, 900, 8, 145, -1, 18, 0}, {2562, 0.5714f, 333, 335, 1400, 8, 146, -1, 25, 0}}
#define SHOP_FIRST {0, 8, 21, 30}
-#define SHOP_ROW_GEO {2356, 1.4551f, 0.0000f, 1.0000f, 1.0000f}
+#define SHOP_ROW_GEO {2537, 1.4551f, 0.0000f, 1.0000f, 1.0000f}
#define SHOP_ROW_COST {1.8423f, 0.2885f}
#define SHOP_ACTIVE_RGB {255, 255, 255}
#define SHOP_INACTIVE_RGB {141, 141, 141}
#define SHOP_ROOMS {"Room_shop", "Room_mapper", "Room_Charm_Shop"}
-#define SHOP_NOSTOCK {318, 319, 320}
+#define SHOP_NOSTOCK {337, 338, 339}
#define SHOP_TITLES {TITLE_SLY, TITLE_ISELDA, TITLE_CHARM_SLUG}
#define SHOP_N 3
#define COLLECT_FLEUR {0.0000f, 0.0000f, 0.0000f, 1.0000f}
@@ -1161,84 +1176,85 @@
#define COLLECT_GLOW {0.0263f, -0.0329f, -0.5000f, 2.0000f}
#define COLLECT_PIECE {{0.1200f, 0.1000f, 0.0000f, 1.0000f}, {-0.0016f, -0.2000f, -1.0000f, 1.0216f}}
#define COLLECT_MOVER_TO {-7.7000f, 6.0400f}
+#define STAG_N 4
#define STAG_AT {0.3000f, 0.3000f}
#define STAG_K 1.2646f
-#define STAG_BACKING {2382, -0.4427f, 0.0000f, 1.0000f, 0.6408f}
+#define STAG_BACKING {2563, -0.4427f, 0.0000f, 1.0000f, 0.6408f}
#define STAG_BACKING_A 0.9020f
-#define STAG_PIECES {{2383, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2384, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2385, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {2386, 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_PIECES {{2564, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2565, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2566, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {2567, 0.4147f, 1.5909f, 1.0000f, 1.0000f}, {2568, 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 {2387, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
-#define STAG_MAP_SHADOW {2388, 0.0110f, -0.0100f, 1.0000f, 0.9227f}
+#define STAG_MAP_KNIGHT {2569, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define STAG_MAP_SHADOW {2570, 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 {2389, 2.8680f, 0.6180f, -1.0000f, 1.0000f}
-#define STAG_POINTER_L {2389, -2.8680f, 0.6180f, 1.0000f, 1.0000f}
+#define STAG_POINTER_R {2571, 2.8680f, 0.6180f, -1.0000f, 1.0000f}
+#define STAG_POINTER_L {2571, -2.8680f, 0.6180f, 1.0000f, 1.0000f}
#define STAG_ROW {-7.5992f, 3.9576f}
-#define STAG_LIST_KNIGHT {2387, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
-#define STAG_DIVIDER {2390, -7.6003f, 5.2734f, -1.0000f, -0.8696f}
+#define STAG_LIST_KNIGHT {2569, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
+#define STAG_DIVIDER {2572, -7.6003f, 5.2734f, -1.0000f, -0.8696f}
#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}
-#define TXT_STAG_STATIONS 321
-#define TXT_STAG_NAMES {322, 282, 284}
-#define STAG_NAMES_STR {0, 1, 2}
+#define TXT_STAG_STATIONS 340
+#define TXT_STAG_NAMES {341, 301, 303, 342}
+#define STAG_NAMES_STR {29, 28, 32, 31}
#define STAG_BORDER_TOP {-0.0963f, 7.0185f, 0.9784f, 1.0028f, CLIP_STAGUI_STAG_BORDER_TOP_UP, CLIP_STAGUI_STAG_BORDER_TOP_DOWN, 0}
#define STAG_BORDER_BOTTOM {-0.0638f, -6.5632f, 0.9165f, 0.9394f, CLIP_STAGUI_STAG_BORDER_BOTTOM_UP, CLIP_STAGUI_STAG_BORDER_BOTTOM_DOWN, 0}
#define STAG_T_ACT_CONFIRM {11.1713f, -4.5306f, 15.3500f}
#define STAG_KEY_CONFIRM {11.7464f, -4.7993f}
-#define TXT_STAG_CTRL_TRAVEL 323
+#define TXT_STAG_CTRL_TRAVEL 343
#define STAG_T_ACT_CANCEL {11.1713f, -5.3525f, 15.3500f}
#define STAG_KEY_CANCEL {11.7464f, -5.6213f}
-#define TXT_STAG_CTRL_CANCEL 257
-#define STAG_SCENES_STR {3, 4, 5}
-#define STAG_SCENES_ROOM {32772, 32787, 32804}
-#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 327, 0x0u}, {2, 18, 130, -0.0400f, -7.8800f, 328, 0x20u}, {20, 12, 131, 16.3100f, -7.8700f, 330, 0x0u}}
-#define MAP_ROOMS {{0, 255, 2391, 2392, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 255, 2398, 2399, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 127, 2401, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 2402, 2403, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 255, 2404, 2405, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 255, 2406, 2407, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 255, 2408, 2409, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 255, 2410, 2411, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2412, 2413, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 38, 2414, -1, -2.2000f, 3.7130f, 0.6600f, 0.7900f, 0xB5DDFB, 0}, {1, 255, 2415, 2416, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 255, 2417, 2418, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 2419, 2420, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2421, 2422, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2423, 2424, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 255, 2425, 2426, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 255, 2427, 2428, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 255, 2429, 2430, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 255, 2431, 2432, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2433, 2434, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 2435, 2436, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 255, 2437, 2438, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 255, 2439, 2440, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 2441, 2442, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 255, 2443, 2444, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 2445, 2446, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 255, 2447, 2448, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 2449, 2450, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 255, 2451, 2452, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 255, 2453, 2454, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 255, 2455, 2456, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 255, 2457, 2458, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}
-#define MAP_PINS {{0, 0, 2393, -2.0390f, 7.7500f, 133, -1}, {0, 0, 2394, -1.6430f, 7.7500f, 137, -1}, {0, 0, 2395, -2.4700f, 7.7500f, 135, 122}, {0, 0, 2396, -1.2540f, 7.7600f, 135, 123}, {1, 1, 2400, -6.2100f, 7.6800f, 134, -1}, {21, 1, 2400, -10.9970f, 6.6240f, 134, -1}, {22, 0, 2393, -11.2580f, 4.9690f, 133, -1}, {30, 0, 2393, -7.6610f, 6.0700f, 133, -1}}
-#define MAP_NEXT {{0, 2397, -1.0730f, 6.4850f, 180.0000f, 326, -1.0730f, 6.1870f, 1, -1}, {19, 2397, -1.0730f, 7.2500f, 0.0000f, 325, -1.0930f, 7.9120f, 1, -1}, {31, 2397, -4.5300f, 5.8450f, -90.0000f, 326, -4.1075f, 6.0470f, 0, 6}}
-#define MAP_NAMES {{0, -1, 324, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 325, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 326, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {2, -1, 329, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}
+#define TXT_STAG_CTRL_CANCEL 276
+#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, 347, 0x0u}, {2, 18, 130, -0.0400f, -7.8800f, 348, 0x20u}, {20, 12, 131, 16.3100f, -7.8700f, 350, 0x0u}}
+#define MAP_ROOMS {{0, 255, 2573, 2574, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 255, 2580, 2581, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 127, 2583, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 2584, 2585, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 255, 2586, 2587, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 255, 2588, 2589, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 255, 2590, 2591, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 255, 2592, 2593, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2594, 2595, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 38, 2596, -1, -2.2000f, 3.7130f, 0.6600f, 0.7900f, 0xB5DDFB, 0}, {1, 255, 2597, 2598, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 255, 2599, 2600, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 2601, 2602, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2603, 2604, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2605, 2606, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 255, 2607, 2608, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 255, 2609, 2610, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 255, 2611, 2612, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 255, 2613, 2614, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2615, 2616, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 2617, 2618, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 255, 2619, 2620, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 255, 2621, 2622, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 2623, 2624, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 255, 2625, 2626, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 2627, 2628, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 255, 2629, 2630, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 2631, 2632, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 255, 2633, 2634, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 255, 2635, 2636, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 255, 2637, 2638, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 255, 2639, 2640, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}
+#define MAP_PINS {{0, 0, 2575, -2.0390f, 7.7500f, 133, -1}, {0, 0, 2576, -1.6430f, 7.7500f, 137, -1}, {0, 0, 2577, -2.4700f, 7.7500f, 135, 122}, {0, 0, 2578, -1.2540f, 7.7600f, 135, 123}, {1, 1, 2582, -6.2100f, 7.6800f, 134, -1}, {21, 1, 2582, -10.9970f, 6.6240f, 134, -1}, {22, 0, 2575, -11.2580f, 4.9690f, 133, -1}, {30, 0, 2575, -7.6610f, 6.0700f, 133, -1}}
+#define MAP_NEXT {{0, 2579, -1.0730f, 6.4850f, 180.0000f, 346, -1.0730f, 6.1870f, 1, -1}, {19, 2579, -1.0730f, 7.2500f, 0.0000f, 345, -1.0930f, 7.9120f, 1, -1}, {31, 2579, -4.5300f, 5.8450f, -90.0000f, 346, -4.1075f, 6.0470f, 0, 6}}
+#define MAP_NAMES {{0, -1, 344, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 345, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 346, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {2, -1, 349, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}
#define MAP_QUICK_K 1.5500f
-#define MAP_SHADE {{2459, 0.0055f, -0.0110f, 178}, {2460, 0.0000f, 0.0000f, 255}}
-#define MAP_MARKERS {2461, 2462, 2463, 2464}
+#define MAP_SHADE {{2641, 0.0055f, -0.0110f, 178}, {2642, 0.0000f, 0.0000f, 255}}
+#define MAP_MARKERS {2643, 2644, 2645, 2646}
#define MAP_COMPASS_K 0.7000f
#define MAP_BG_A 0.4438f
#define MAP_TITLE {0.0000f, 7.5363f}
-#define MAP_TITLE_BACK {2465, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}
-#define MAP_NO_MAP {2466, 0.0000f, 0.9400f}
-#define MAP_NO_MAP_MSG {331, -0.0600f, -1.2932f}
-#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 332, 2467, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}
+#define MAP_TITLE_BACK {2647, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}
+#define MAP_NO_MAP {2648, 0.0000f, 0.9400f}
+#define MAP_NO_MAP_MSG {351, -0.0600f, -1.2932f}
+#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 352, 2649, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}
#define MAP_MSG_K 0.7000f
#define FIRSTMAP_BG_A 0.6410f
-#define FIRSTMAP_TEXTS {{333, 0.0000f, 5.0305f}, {91, 0.0000f, -0.8796f}, {334, 0.0000f, -3.2895f}, {335, 0.0000f, -4.6996f}}
-#define FIRSTMAP_PIECES {{2468, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {2469, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {2470, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}
-#define FIRSTMAP_KEY {336, 0.0900f, -2.3200f}
-#define MAP_WIDE {{{2471, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 337, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{2472, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 338, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{2473, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 339, {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 {{353, 0.0000f, 5.0305f}, {110, 0.0000f, -0.8796f}, {354, 0.0000f, -3.2895f}, {355, 0.0000f, -4.6996f}}
+#define FIRSTMAP_PIECES {{2650, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {2651, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {2652, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}
+#define FIRSTMAP_KEY {356, 0.0900f, -2.3200f}
+#define MAP_WIDE {{{2653, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 357, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{2654, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 358, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{2655, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 359, {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 {{2474, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {2474, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {2474, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {2474, 17.1900f, -7.1700f, 1.0f, -90.0000f}}
-#define MAP_ACT_CONFIRM {{2475, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {340, 341, 341}}
-#define MAP_ACT_MARKER {{2475, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {342, 343, 344}}
-#define MAP_ACT_CANCEL {{2475, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {257, 257, 257}}
-#define MAP_ACT_CHANGE {{2475, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {345, 345, 345}}
-#define MAP_ACT_KEY {{2475, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {346, 347, 348}}
-#define MAP_KEY_BB {2476, 13.6200f, 3.4200f, 0.3781f, 1.0000f}
+#define MAP_PAN_ARROWS {{2656, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {2656, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {2656, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {2656, 17.1900f, -7.1700f, 1.0f, -90.0000f}}
+#define MAP_ACT_CONFIRM {{2657, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {360, 361, 361}}
+#define MAP_ACT_MARKER {{2657, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {362, 363, 364}}
+#define MAP_ACT_CANCEL {{2657, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {276, 276, 276}}
+#define MAP_ACT_CHANGE {{2657, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {365, 365, 365}}
+#define MAP_ACT_KEY {{2657, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {366, 367, 368}}
+#define MAP_KEY_BB {2658, 13.6200f, 3.4200f, 0.3781f, 1.0000f}
#define MAP_KEY_STEP -0.8250f
-#define MAP_KEY_ROWS {{{2477, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 349, {12.7550f, -1.5413f, 15.3500f}}, {{2478, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 350, {12.7550f, -1.5413f, 15.3500f}}, {{2479, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 351, {12.7550f, -1.5413f, 15.3500f}}, {{2480, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 352, {12.7550f, -1.5413f, 15.3500f}}, {{2481, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 353, {12.7550f, -1.5413f, 15.3500f}}}
+#define MAP_KEY_ROWS {{{2659, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 369, {12.7550f, -1.5413f, 15.3500f}}, {{2660, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 370, {12.7550f, -1.5413f, 15.3500f}}, {{2661, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 371, {12.7550f, -1.5413f, 15.3500f}}, {{2662, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 372, {12.7550f, -1.5413f, 15.3500f}}, {{2663, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 373, {12.7550f, -1.5413f, 15.3500f}}}
#define MAP_KEY_FLAGS {133, 134, 135, 136, 137}
#define MAP_KEY_N 5
-#define MAP_MM_PIECES {{2482, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {2483, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {2484, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {2485, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}
-#define MAP_MM_MARKERS {2486, 2487, 2488, 2489}
+#define MAP_MM_PIECES {{2664, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {2665, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {2666, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {2667, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}
+#define MAP_MM_MARKERS {2668, 2669, 2670, 2671}
#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 {2490, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}
+#define MAP_MM_PLACE {2672, 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 354
-#define ROOM_ZONES {5, 9, 9, 9}
+#define TXT_KEY_SHIFT 374
+#define ROOM_ZONES {5, 9, 9, 9, 9, 24, 24}
#define MSG_FIREBALL 0
#define MSG_DASH 1
-#define SEMI_PERSIST {13, 14, 15, 16}
+#define SEMI_PERSIST {13, 14, 15, 16, 22, 23, 24, 25, 26}
diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.h
index 8baa0c89..3e20ee1e 100644
--- a/games/hollowknight/src/game.h
+++ b/games/hollowknight/src/game.h
@@ -42,7 +42,7 @@ enum {
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_FALSE_KNIGHT_WALL_REPAIRED, PDF_FALSE_KNIGHT_WALL_BROKEN, PDF_VISITED_FUNGUS, PDF_VISITED_RUINS,
- PDF_DEFEATED_MANTIS_LORDS, PDF_MAGE_LORD_DEFEATED, PDF_COUNT
+ PDF_DEFEATED_MANTIS_LORDS, PDF_MAGE_LORD_DEFEATED, PDF_OPENED_FUNGAL_WASTES, PDF_COUNT
};
typedef struct {
/* (saved: the layout only ever grows into reserved) */
diff --git a/games/hollowknight/src/stag.c b/games/hollowknight/src/stag.c
index 47b300a0..afe4b57a 100644
--- a/games/hollowknight/src/stag.c
+++ b/games/hollowknight/src/stag.c
@@ -10,7 +10,7 @@
#define DT 0.02f
#define HUD_PX (FOCAL / (-1.342f - CAM_Z))
-#define NSTATIONS 3
+#define NSTATIONS STAG_N
#define RESERVE 80 /* (the frame's instances kept for it) */
#define STAG_TITLE_OVER 0.16f /* (Stations' baseline over its divider, as the game has it) */
#define STAG_KEYS_GAP 0.15f /* (between the two actions' lines) */
@@ -78,7 +78,8 @@ void stag_travel(void) {
sg.prev = g_hero.keys;
}
-static const int16_t scenes_str[NSTATIONS] = STAG_SCENES_STR, scenes_room[NSTATIONS] = STAG_SCENES_ROOM;
+static const int16_t scenes_str[NSTATIONS] = STAG_SCENES_STR;
+static const uint16_t scenes_room[NSTATIONS] = STAG_SCENES_ROOM; /* (0x8000 and its number: a room of the other app) */
static int room_named(int str) {
for (int i = 0; i < NSTATIONS; i++)
if (scenes_str[i] == str) return scenes_room[i];
diff --git a/games/hollowknight/tools/rooms_fw.txt b/games/hollowknight/tools/rooms_fw.txt
index 6a12987b..69eb12a2 100644
--- a/games/hollowknight/tools/rooms_fw.txt
+++ b/games/hollowknight/tools/rooms_fw.txt
@@ -2,3 +2,6 @@ Crossroads_18
Fungus2_06
Fungus2_05
Fungus2_04
+Fungus2_03
+Fungus2_01
+Fungus2_02
diff --git a/games/hollowknight/tools/stag.py b/games/hollowknight/tools/stag.py
index 54546343..ebe5b9a5 100644
--- a/games/hollowknight/tools/stag.py
+++ b/games/hollowknight/tools/stag.py
@@ -7,8 +7,10 @@ import unity, ents, tk2d, text
MENU = ("resources.assets", 7203)
AT = (0.3, 0.3)
# the stations here: their list item, their map piece, the PlayerData bool that opens them (None: open from the start)
-STATIONS = (("Dirtmouth", None), ("Crossroads", "openedCrossroads"), ("Greenpath", "openedGreenpath"))
-SCENES = ("Room_Town_Stag_Station", "Crossroads_47", "Fungus1_16_alt") # (their rooms: Stag Control's To Scene)
+# (both apps list them all: a ride to a station of the other one is a way there)
+STATIONS = (("Dirtmouth", None), ("Crossroads", "openedCrossroads"), ("Greenpath", "openedGreenpath"),
+ ("Fungal Wastes", "openedFungalWastes"))
+SCENES = ("Room_Town_Stag_Station", "Crossroads_47", "Fungus1_16_alt", "Fungus2_02") # (their rooms: Stag Control's To Scene)
def build(sprites, texts, res, actor_clip, pd_flags, str_id, rooms):
@@ -55,6 +57,7 @@ def build(sprites, texts, res, actor_clip, pd_flags, str_id, rooms):
x0 = x - tc["m_pivot"]["x"] * w
return "{%s, %s, %s}" % (U(x0 + (0, w / 2, w, 0)[al]), U(y + (1 - tc["m_pivot"]["y"]) * h), U(w))
+ out["STAG_N"] = str(len(STATIONS))
out["STAG_AT"] = "{%s, %s}" % (U(AT[0]), U(AT[1]))
out["STAG_K"] = U(rk) # (its scale, open)
out["STAG_BACKING"] = piece("backing")
@@ -94,7 +97,7 @@ def build(sprites, texts, res, actor_clip, pd_flags, str_id, rooms):
out["STAG_DIVIDER"] = piece("UI List Stag/Divider")
out["STAG_T_STATIONS"] = tx("UI List Stag/Stations")
out["TXT_STAG_STATIONS"] = texts.add(text.clean(sh["StagMenu"]["STATIONS"]), "MSG")
- out["TXT_STAG_NAMES"] = "{%s}" % ", ".join(str(texts.add(text.clean(sh["StagMenu"][n.upper()]), "TUTE"))
+ out["TXT_STAG_NAMES"] = "{%s}" % ", ".join(str(texts.add(text.clean(sh["StagMenu"][n.upper().replace(" ", "_")]), "TUTE"))
for n, _ in STATIONS)
out["STAG_NAMES_STR"] = "{%s}" % ", ".join(str(str_id(n)) for n, _ in STATIONS)
# the borders (Border Display: their clips up as it opens)
diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.py
index 5b7c5a4a..f4024111 100644
--- a/games/hollowknight/tools/vm.py
+++ b/games/hollowknight/tools/vm.py
@@ -16,6 +16,7 @@ ROOMS = {
"Crossroads_47": ["_NPCs/Tiso Bench NPC", "Stag", "_Scenery/Station Bell", "Stag_Tunnel/Stag_tunnel_Grate",
"Stag Blanker"],
"Fungus1_16_alt": ["Stag", "Station Bell", "Stag_tunnel_Grate", "Stag Blanker"],
+ "Fungus2_02": ["Stag", "Station Bell", "Stag_tunnel_Grate", "Stag Blanker"],
"Room_Town_Stag_Station": ["Stag", "Station Bell", "Stag_Tunnel/Stag_tunnel_Grate", "Stag Blanker", "Stag Lift",
"Station Door", "Gate Switch"],
"Room_ruinhouse": ["Sly Dazed"],