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: fit the flash (characters, props and scenery a little less fine; the Knight and the UI as they were); sprite records smaller; same frames shared

Mason Chene72db3107ea0
diff --git a/games/hollowknight/src/anim.c b/games/hollowknight/src/anim.c
index 3cd02d09..4ed66c0c 100644
--- a/games/hollowknight/src/anim.c
+++ b/games/hollowknight/src/anim.c
@@ -165,14 +165,14 @@ uint16_t to_f16(float f) {
/* the sprite drawn at (x, y, z), scaled (sx < 0: mirrored), tinted */
void sprite_inst(int sprite, float x, float y, float z, float sx, float sy, uint8_t tint, Inst *out) {
const SpriteRec *s = sprite_rec(sprite);
- out->ax = (int16_t)lrintf((x + sx * s->lx) * 64);
- out->ay = (int16_t)lrintf((y + sy * s->ty) * 64);
+ out->ax = (int16_t)lrintf(x * 64 + sx * s->lx);
+ out->ay = (int16_t)lrintf(y * 64 + sy * s->ty);
out->z = (int16_t)lrintf(z * 128);
out->tex = s->tex;
out->tint = tint;
out->flags = 0;
- out->a = to_f16(sx * s->tu);
- out->b = to_f16(-sy * s->tv);
+ out->a = to_f16(sx * f16(s->tu));
+ out->b = to_f16(-sy * f16(s->tv));
out->rot = 0;
out->group = 0;
}
@@ -182,7 +182,7 @@ void sprite_inst_rot(int sprite, float x, float y, float z, float sx, float sy,
sprite_inst(sprite, x, y, z, sx, sy, tint, out);
float r = degrees * (float)M_PI / 180, c = cosf(r), s = sinf(r);
const SpriteRec *sp = sprite_rec(sprite);
- float lx = sx * sp->lx, ty = sy * sp->ty;
+ float lx = sx * sp->lx / 64.0f, ty = sy * sp->ty / 64.0f;
out->ax = (int16_t)lrintf((x + c * lx - s * ty) * 64);
out->ay = (int16_t)lrintf((y + s * lx + c * ty) * 64);
int32_t rot = (int32_t)lrintf(degrees / 360.0f * 65536.0f);
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.bin
index 91accf48..b06cdc1b 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 2b1593ca..58fc504d 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 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 3595
+#define SPRITE_HERO_LIGHT 2868
+#define SPRITE_DIALOGUE_BACKBOARD 2869
+#define SPRITE_PROMPT_SHADOW 2870
+#define SPRITE_CORPSE_NAIL 2871
+#define SPRITE_FK_BARREL 2872
+#define SPRITE_FK_STAFF 2873
+#define SPRITE_DIGIT0 3439
#define STYLE_DIALOGUE 0
#define STYLE_PROMPT 1
#define STYLE_TITLE_L 2
@@ -958,34 +958,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 3030
+#define SPRITE_FLEUR_TOP 2874
#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 3031
+#define SPRITE_FLEUR_BOT 2875
#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 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 VM_PIECE_BASE 2854
+#define SPRITE_MSG_BG 2876
+#define SPRITE_MSG_STOP 2877
+#define SPRITE_MSG_FLEUR 2878
+#define SPRITE_MSG_KEY 2879
+#define SPRITE_MSG_ICON_FIREBALL 2880
+#define SPRITE_MSG_ICON_DASH 2881
+#define SPRITE_GRASS_BALL 2882
+#define SPRITE_SOUL_ORB 2883
#define SOUL_ORB_SORT {13, 0}
#define MSG_TABLE {{168, 169, 170, 171, 172, 173}, {174, 175, 176, 177, 178, 179}}
-#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 NOTICE_BACKBOARD {2884, 1.0000f, 0.6931f}
+#define TUTE_FLEUR {2878, 1.0000f, 1.0000f}
+#define TUTE_BACKBOARD {2885, 1.0000f, 0.9560f}
+#define TUTE_IMAGE {2886, 1.0000f, 1.0000f}
+#define TUTE_STOP {2877, 1.0000f, 1.0000f}
+#define FOCUS_PROMPT_BG {2887, 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 {3044, 3045, 3046, 3047}
+#define NOTICE_ICONS {2888, 2889, 2890, 2891}
#define CHARM_ICON_K 1.5000f
-#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_ICONS {-1, 2892, 2893, 2894, 2895, -1, 2896, 2897, 2898, -1, -1, -1, -1, -1, 2899, -1, -1, -1, 2900, 2901, 2902, -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
@@ -993,37 +993,37 @@
#define TXT_YN_YES 198
#define TXT_YN_NO 199
#define TXT_YN_NOT_ENOUGH 200
-#define MENU_LOGO {3059, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_LOGO {2903, 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 {3060, 0.0000f, 0.0000f, 1.0023f, 1.0000f}
+#define MENU_POINTER {2904, 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 {3061, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
+#define MENU_PROFILES_FLEUR {2905, 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, {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_ZONES {{2, {2906, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2907, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2908, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2909, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2910, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
#define MENU_SLOT_NZONES 5
#define MENU_SLOT_BG_DY 0.0102f
-#define MENU_SLOT_FLEUR {3067, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_FLEUR {2911, 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 {3068, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_SELECTOR {2912, 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 {3069, 0.0000f, 0.0000f, 1.0000f, 1.0025f}
+#define MENU_SLOT_CURSOR {2913, 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 {3070, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_ORB {2914, 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 {3071, 0.0000f, 0.0000f, 1.0039f, 1.0000f}
+#define MENU_SLOT_GEO {2915, 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 {3072, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_HEALTH {2916, 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
@@ -1041,9 +1041,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 {3073, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_TOP {2917, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_PAUSE_TOP_Y 2.3653f
-#define MENU_PAUSE_BOT {3074, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_BOT {2918, 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
@@ -1062,39 +1062,39 @@
#define TXT_ZONES {213, 214, 215, 216, 217}
#define INV_X -4.0500f
#define INV_Y 7.5500f
-#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_BORDER {{2919, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2919, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2920, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2921, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2922, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2923, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
#define INV_NBORDER 6
-#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_FRAME {2924, 4.0479f, -7.1963f, 1.0f, 1.0f}
+#define INV_ARROW_L {2925, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
+#define INV_ARROW_R {2925, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_L {2926, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_R {2926, 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 {3083, -7.9200f, -8.3700f, 1.0000f, 1.0000f}
+#define CH_BB {2927, -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 {3084, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
+#define CH_GLOW {2928, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
#define CH_GLOW_A 0.6970f
-#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_ICONS {-1, 2892, 2893, 2894, 2895, -1, 2896, 2897, 2898, -1, -1, -1, -1, -1, 2899, -1, -1, -1, 2900, 2901, 2902, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CH_NEXT_DOT {2929, 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 {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_FULL {2930, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_EMPTY {2931, 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 {3088, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
+#define CH_DIVIDER {2932, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}
-#define CH_COST_PIP {3086, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_COST_PIP {2930, 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
@@ -1103,9 +1103,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 {3089, 16.3208f, -13.2878f, 1.0f, 1.0f}
+#define CH_CONFIRM_KEY {2933, 16.3208f, -13.2878f, 1.0f, 1.0f}
#define CH_CONFIRM_KEY_W 0.6412f
-#define CH_CURSOR {3090, 0.0000f, 0.0000f, 1.0000f, 0.9756f}
+#define CH_CURSOR {2934, 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
@@ -1119,23 +1119,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 {{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 {{2935, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2936, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2937, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2938, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2939, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2940, -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}, {2941, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2942, -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 {{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_HEART_PIECES {{2943, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2944, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2945, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2946, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
+#define INV_VESSEL_PIECES {{2947, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2948, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2949, -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 {{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 {{2950, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2951, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2952, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2953, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2954, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2955, 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 {{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_TRINKETS {{2956, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2957, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2958, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2959, 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 {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_TRINKET_BB {2960, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
+#define INV_DIVIDERS {{2961, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2961, 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}}
@@ -1144,15 +1144,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 {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_BACKBOARD {2962, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
+#define SHOP_MASK_TOP {2963, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
+#define SHOP_MASK_BOTTOM {2964, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
+#define SHOP_ARROW_U {2965, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
+#define SHOP_ARROW_D {2965, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
+#define SHOP_SELECTOR {2966, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
+#define SHOP_CONFIRM_GEO {2967, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_L {2968, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_R {2968, 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
@@ -1172,7 +1172,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 {3125, 5.5100f, 2.5800f, 1.0000f, 1.0000f}
+#define SHOP_PEG {2969, 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}
@@ -1193,9 +1193,9 @@
#define TXT_SHOP_YES 315
#define TXT_SHOP_NO 316
#define SHOP_DESC_BOTTOM -5.0500f
-#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_ITEMS {{2971, 0.5714f, 317, 318, 150, 1, 125, -1, 0, 0}, {2971, 0.5714f, 317, 319, 500, 1, 126, 125, 0, 0}, {2972, 0.5714f, 320, 321, 550, 3, 127, -1, 0, 0}, {2973, 0.5714f, 322, 323, 950, 10, 128, -1, 0, 0}, {2974, 0.5714f, 324, 325, 300, 2, 37, -1, 0, 1}, {2975, 0.5714f, 326, 327, 200, 2, 40, -1, 0, 4}, {2976, 0.5714f, 328, 329, 1800, 0, 119, -1, 0, 0}, {2977, 0.5714f, 330, 331, 60, 11, 129, -1, 0, 0}, {2978, 0.5714f, 332, 333, 220, 2, 38, -1, 0, 2}, {2979, 0.5714f, 334, 335, 120, 0, 2, -1, 0, 0}, {2980, 0.5714f, 336, 337, 40, 9, 130, 10, 0, 0}, {2980, 0.5714f, 338, 339, 80, 9, 131, 28, 0, 0}, {2981, 0.5714f, 340, 341, 100, 16, 133, -1, 0, 0}, {2982, 0.5714f, 342, 343, 100, 16, 134, -1, 0, 0}, {2983, 0.5714f, 344, 345, 100, 16, 135, -1, 0, 0}, {2984, 0.5714f, 346, 347, 100, 16, 137, 147, 0, 0}, {2985, 0.5714f, 348, 349, 100, 16, 136, -1, 0, 0}, {2986, 0.5714f, 350, 351, 100, 17, 139, -1, 0, 0}, {2987, 0.5714f, 352, 353, 100, 17, 140, -1, 0, 0}, {2988, 0.5714f, 354, 355, 100, 17, 141, 14, 0, 0}, {2989, 0.5714f, 356, 357, 210, 17, 142, 14, 0, 0}, {2990, 0.5714f, 358, 359, 250, 2, 44, -1, 0, 8}, {2991, 0.5714f, 360, 361, 300, 2, 54, -1, 0, 18}, {2992, 0.5714f, 362, 363, 120, 2, 50, -1, 0, 14}, {2993, 0.5714f, 364, 365, 220, 2, 55, -1, 0, 19}, {2994, 0.5714f, 366, 367, 800, 2, 43, -1, 0, 7}, {2995, 0.5714f, 368, 369, 120, 8, 143, -1, 5, 0}, {2995, 0.5714f, 368, 369, 500, 8, 144, -1, 10, 0}, {2995, 0.5714f, 368, 369, 900, 8, 145, -1, 18, 0}, {2995, 0.5714f, 368, 370, 1400, 8, 146, -1, 25, 0}}
#define SHOP_FIRST {0, 8, 21, 30}
-#define SHOP_ROW_GEO {3126, 1.4551f, 0.0000f, 1.0000f, 1.0000f}
+#define SHOP_ROW_GEO {2970, 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}
@@ -1210,21 +1210,21 @@
#define COLLECT_MOVER_TO {-7.7000f, 6.0400f}
#define STAG_AT {0.3000f, 0.3000f}
#define STAG_K 1.2646f
-#define STAG_BACKING {3152, -0.4427f, 0.0000f, 1.0000f, 0.6408f}
+#define STAG_BACKING {2996, -0.4427f, 0.0000f, 1.0000f, 0.6408f}
#define STAG_BACKING_A 0.9020f
-#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_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_SELECTOR {0.0000f, 0.0000f, 1.1797f, 1.2092f}
-#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_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_T_ROW {-7.5992f, 4.9095f, 5.8145f}
#define STAG_ROW_DY 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_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_ROW {-7.5992f, 3.9576f}
-#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_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_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}
#define TXT_STAG_STATIONS 375
#define TXT_STAG_NAMES {376, 336, 338}
@@ -1240,48 +1240,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, 24, 130, -0.0400f, -7.8800f, 384, 0x400020u}, {26, 16, 131, 16.3100f, -7.8700f, 385, 0x40u}}
-#define MAP_ROOMS {{0, 1, 3161, 3162, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 0, 3168, 3169, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 12, -1, -1, -1.5030f, 5.1050f, 0.0000f, 0.0000f, 0x000000, 0}, {1, 38, 3171, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 3172, 3173, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 19, 3174, -1, 1.4650f, 4.4640f, 0.6500f, 0.3100f, 0xB5DDFB, 0}, {1, 255, 3175, 3176, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 15, 3177, 3178, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 9, 3179, -1, -3.0980f, 6.4880f, 1.1110f, 0.4800f, 0xB5DDFB, 0}, {1, 10, 3181, 3182, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 25, 3183, -1, -0.6440f, 4.4430f, 0.7000f, 0.3700f, 0xB5DDFB, 0}, {1, 14, 3185, 3186, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 20, 3187, 3188, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 17, 3189, 3190, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 16, 3191, 3192, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3193, 3194, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3195, 3196, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 26, 3197, -1, -3.7180f, 5.7650f, 2.3517f, 0.4300f, 0xB5DDFB, 0}, {1, 13, 3199, 3200, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 24, 3201, 3202, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 8, 3203, 3204, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 11, 3205, -1, -1.5030f, 5.1050f, 0.8500f, 0.8900f, 0xB5DDFB, 0}, {1, 21, 3206, -1, 3.7290f, 3.4460f, 2.4100f, 0.6600f, 0xB5DDFB, 0}, {1, 18, 3208, 3209, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 6, 3210, 3211, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 5, 3212, 3213, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 3214, 3215, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 33, 3216, 3217, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 32, 3218, 3219, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 3220, 3221, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 35, 3222, -1, -12.3910f, 5.0270f, 0.5700f, 1.9700f, 0xCFFFC3, 0}, {2, 34, 3223, 3224, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3225, 3226, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 30, 3227, -1, -9.2170f, 5.6940f, 1.2300f, 0.4400f, 0xCFFFC3, 0}, {2, 36, 3228, -1, -12.9760f, 5.8120f, 0.6000f, 0.3000f, 0xCFFFC3, 0}, {2, 255, 3229, 3230, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3231, 3232, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 37, 3233, 3234, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 31, 3235, -1, -10.4130f, 5.6780f, 1.1700f, 0.5500f, 0xCFFFC3, 0}, {2, 29, 3236, 3237, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 28, 3238, 3239, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 27, 3240, 3241, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}
-#define MAP_PINS {{0, 0, 3163, -2.0390f, 7.7500f, 133, -1}, {0, 0, 3164, -1.6430f, 7.7500f, 137, -1}, {0, 0, 3165, -2.4700f, 7.7500f, 135, 122}, {0, 0, 3166, -1.2540f, 7.7600f, 135, 123}, {1, 1, 3170, -6.2100f, 7.6800f, 134, -1}, {2, 1, 3170, -1.3150f, 5.0920f, 134, -1}, {5, 0, 3164, 1.2400f, 4.4520f, 137, -1}, {5, 0, 3163, 1.6210f, 4.4490f, 133, -1}, {8, 0, 3180, -3.0697f, 6.4597f, 135, -1}, {10, 0, 3163, -0.3430f, 4.4060f, 133, -1}, {10, 0, 3184, -0.7200f, 4.3930f, 136, -1}, {21, 0, 3163, -1.6940f, 5.0880f, 133, -1}, {22, 0, 3207, 4.5530f, 3.3700f, 135, 124}, {22, 0, 3163, 4.9480f, 3.3820f, 133, -1}, {27, 1, 3170, -10.9970f, 6.6240f, 134, -1}, {28, 0, 3163, -11.2580f, 4.9690f, 133, -1}, {34, 0, 3163, -12.8160f, 5.7890f, 133, -1}, {34, 0, 3164, -13.1960f, 5.7970f, 137, -1}, {40, 0, 3163, -7.6610f, 6.0700f, 133, -1}}
-#define MAP_NEXT {{0, 3167, -1.0730f, 6.4850f, 180.0000f, 380, -1.0730f, 6.1870f, 1, -1}, {17, 3198, -5.2607f, 5.8454f, 90.0000f, 382, -5.5969f, 6.0434f, 2, 16}, {25, 3167, -1.0730f, 7.2500f, 0.0000f, 379, -1.0930f, 7.9120f, 1, -1}, {41, 3167, -4.5300f, 5.8450f, -90.0000f, 380, -4.1075f, 6.0470f, 0, 6}}
+#define MAP_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, 38, 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, 380, -1.0730f, 6.1870f, 1, -1}, {17, 3042, -5.2607f, 5.8454f, 90.0000f, 382, -5.5969f, 6.0434f, 2, 16}, {25, 3011, -1.0730f, 7.2500f, 0.0000f, 379, -1.0930f, 7.9120f, 1, -1}, {41, 3011, -4.5300f, 5.8450f, -90.0000f, 380, -4.1075f, 6.0470f, 0, 6}}
#define MAP_NAMES {{0, -1, 378, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 379, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 380, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {1, 21, 383, 3.4800f, 5.6971f, 0xB5DCFB, 1, 0}, {2, -1, 382, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}
#define MAP_QUICK_K 1.5500f
-#define MAP_SHADE {{3242, 0.0055f, -0.0110f, 178}, {3243, 0.0000f, 0.0000f, 255}}
-#define MAP_MARKERS {3244, 3245, 3246, 3247}
+#define MAP_SHADE {{3086, 0.0055f, -0.0110f, 178}, {3087, 0.0000f, 0.0000f, 255}}
+#define MAP_MARKERS {3088, 3089, 3090, 3091}
#define MAP_COMPASS_K 0.7000f
#define MAP_BG_A 0.4438f
#define MAP_TITLE {0.0000f, 7.5363f}
-#define MAP_TITLE_BACK {3248, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}
-#define MAP_NO_MAP {3249, 0.0000f, 0.9400f}
+#define MAP_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 {386, -0.0600f, -1.2932f}
-#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 387, 3250, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}
+#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 387, 3094, 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 {{3251, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3252, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3253, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}
+#define FIRSTMAP_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 {391, 0.0900f, -2.3200f}
-#define MAP_WIDE {{{3254, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 392, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3255, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 393, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3256, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 394, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}}
+#define MAP_WIDE {{{3098, 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}}, {{3099, 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}}, {{3100, -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 {{3257, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3257, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3257, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3257, 17.1900f, -7.1700f, 1.0f, -90.0000f}}
-#define MAP_ACT_CONFIRM {{3258, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {395, 396, 396}}
-#define MAP_ACT_MARKER {{3258, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {397, 398, 399}}
-#define MAP_ACT_CANCEL {{3258, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {311, 311, 311}}
-#define MAP_ACT_CHANGE {{3258, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {400, 400, 400}}
-#define MAP_ACT_KEY {{3258, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {401, 402, 403}}
-#define MAP_KEY_BB {3259, 13.6200f, 3.4200f, 0.3781f, 1.0000f}
+#define MAP_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}, {395, 396, 396}}
+#define MAP_ACT_MARKER {{3102, -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 {{3102, 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 {{3102, -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 {{3102, 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 {3103, 13.6200f, 3.4200f, 0.3781f, 1.0000f}
#define MAP_KEY_STEP -0.8250f
-#define MAP_KEY_ROWS {{{3260, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 404, {12.7550f, -1.5413f, 15.3500f}}, {{3261, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 405, {12.7550f, -1.5413f, 15.3500f}}, {{3262, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 406, {12.7550f, -1.5413f, 15.3500f}}, {{3263, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 407, {12.7550f, -1.5413f, 15.3500f}}, {{3264, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 408, {12.7550f, -1.5413f, 15.3500f}}}
+#define MAP_KEY_ROWS {{{3104, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 404, {12.7550f, -1.5413f, 15.3500f}}, {{3105, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 405, {12.7550f, -1.5413f, 15.3500f}}, {{3106, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 406, {12.7550f, -1.5413f, 15.3500f}}, {{3107, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 407, {12.7550f, -1.5413f, 15.3500f}}, {{3108, 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 {{3265, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3266, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3267, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3268, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}
-#define MAP_MM_MARKERS {3269, 3270, 3271, 3272}
+#define MAP_MM_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_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 {3273, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}
+#define MAP_MM_PLACE {3117, 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/hk.h b/games/hollowknight/src/hk.h
index 4f86d584..4aec06c3 100644
--- a/games/hollowknight/src/hk.h
+++ b/games/hollowknight/src/hk.h
@@ -134,8 +134,8 @@ const char *room_name(int id);
/* ---------------------------------------------------------------- sprites and animations (anim.c) */
typedef struct {
uint16_t tex, col; /* (col: its collider, sprite_collider) */
- float lx, ty; /* the texture's top-left corner, from the sprite's origin (units) */
- float tu, tv; /* units a texel */
+ int16_t lx, ty; /* the texture's top-left corner, from the sprite's origin (1/64 unit) */
+ uint16_t tu, tv; /* units a texel (half floats) */
} SpriteRec;
const SpriteRec *sprite_rec(int id);
/* the collider 2D Toolkit sets as a frame shows: SC_UNSET (left as it was), SC_NONE (off), SC_BOX (*data: center x y,
diff --git a/games/hollowknight/tools/actors.py b/games/hollowknight/tools/actors.py
index 8ece2e4a..323cb87f 100644
--- a/games/hollowknight/tools/actors.py
+++ b/games/hollowknight/tools/actors.py
@@ -242,7 +242,8 @@ DRAWN_SCALE = {"Arrow Up": 1.3, "Arrow Down": 1.3, "Stop Up": 1.3, "Stop Down":
K0 = scene.FOCAL / (0.004 - scene.CAMZ) # screen pixels a unit, where actors are (z near 0)
HUD_K = (scene.VIEW_H / 2) / 8.7107 # the HUD's (its orthographic camera)
# (actor, clip): drawn bigger or smaller than their sprites
-ACTOR_RES = float(os.environ.get("HK_ACTOR_RES", "1"))
+ACTOR_RES = float(os.environ.get("HK_ACTOR_RES", "0.7")) # (to fit the flash)
+PIECE_RES = float(os.environ.get("HK_PIECE_RES", "0.7")) # (the scripts' and debris's sprites: a little less fine, to fit)
ACTOR_SCALE = {"hud": HUD_K / K0, "shopui": HUD_K / K0, "stagui": HUD_K / K0, "mapui": HUD_K / K0, "journalmsg": 0.7 * HUD_K / K0, "liquid": 1.4 * HUD_K / K0, "dialogue": text.TEXT_K * HUD_K / K0}
HUD_MASK = 0.7135
@@ -287,6 +288,7 @@ def build():
"""-> (sprites, clips). sprites: [{key, job, lx, ty, tu, tv}] (texture top-left in local units, units a texel);
clips: [{id, fps, wrap, loop, frames: [(sprite, trigger)]}]."""
sprites, index, clips = [], {}, []
+ same = {} # (a frame the same as one before, where it is drawn from: that one)
for actor, (path, pid, names) in ACTORS.items():
lib = tk2d.animation(path, pid)
byname = {unity.S(c["name"]): c for c in lib["clips"]}
@@ -300,7 +302,8 @@ def build():
col = tk2d.collection(cpath, cpid)
img, lx, ty, upp, (wu, hu) = tk2d.sprite_image(cpath, col, f["spriteId"])
k = K0 * DRAWN_SCALE.get(name, 1.0) * ACTOR_SCALE.get(actor, 1.0)
- if actor not in ("knight", "hud", "dialogue", "liquid", "shopui", "stagui"):
+ if actor not in ("knight", "hud", "dialogue", "liquid", "shopui", "stagui", "mapui", "journalmsg",
+ "heartui", "vesselui", "prompt"):
k *= ACTOR_RES # (the others' frames: a little less fine, to fit)
if actor == "hud" and (name.startswith("Health") or name.startswith("Blue")):
k *= HUD_MASK
@@ -308,10 +311,14 @@ def build():
h = max(1, round(img.height * upp * k))
small = img.resize((w, h), Image.BOX)
arr = np.asarray(small).copy()
- index[key] = len(sprites)
- sprites.append({"key": key, "job": art.ImageJob(arr, "%s/%s" % (actor, name)),
- "lx": lx, "ty": ty, "tu": wu / w, "tv": hu / h,
- "col": _collider(col["spriteDefinitions"][f["spriteId"]])})
+ cl = _collider(col["spriteDefinitions"][f["spriteId"]])
+ sk = (arr.tobytes(), arr.shape, lx, ty, wu / w, hu / h, repr(cl))
+ if sk in same:
+ index[key] = same[sk]
+ else:
+ index[key] = same[sk] = len(sprites)
+ sprites.append({"key": key, "job": art.ImageJob(arr, "%s/%s" % (actor, name)),
+ "lx": lx, "ty": ty, "tu": wu / w, "tv": hu / h, "col": cl})
frames.append((index[key], bool(f.get("triggerEvent"))))
clips.append({"id": clip_id(actor, name), "fps": float(c["fps"]), "wrap": int(c["wrapMode"]),
"loop": int(c.get("loopStart", 0)), "frames": frames})
@@ -368,6 +375,7 @@ def unity_sprites(keys):
object's scale."""
out = []
for level, exts, fid, pid, scale, res in keys:
+ res *= PIECE_RES
if level == "tk2d":
path, col, name = exts, fid, pid
c = tk2d.collection(path, col)
diff --git a/games/hollowknight/tools/art.py b/games/hollowknight/tools/art.py
index df6caf89..158f5bde 100644
--- a/games/hollowknight/tools/art.py
+++ b/games/hollowknight/tools/art.py
@@ -15,7 +15,7 @@ BLUR_SIGMA = 1.2 # background blur, calculator pixels (LightBlurredBackgr
BLUR_SCALE = float(os.environ.get("HK_BLUR_SCALE", "0.25")) # texels a screen pixel behind the blur plane
FG_SCALE = float(os.environ.get("HK_FG_SCALE", "0.6")) # ... in front of the gameplay plane (z < FG_Z)
FG_Z = -2.5
-FIT_K = float(os.environ.get("HK_FIT_K", "1")) # (all the rooms' scenery a little less fine, to fit)
+FIT_K = float(os.environ.get("HK_FIT_K", "0.8")) # (all the rooms' scenery a little less fine, to fit the flash)
BLUR_PRE = False # (the game blurs the background as a whole: the calculator does too)
LZMA_FILTERS = [{"id": lzma.FILTER_LZMA1, "lc": 0, "lp": 0, "pb": 0, "dict_size": 1 << 12, "preset": 9 | lzma.PRESET_EXTREME}]
diff --git a/games/hollowknight/tools/pack.py b/games/hollowknight/tools/pack.py
index 583a9978..19ef4df6 100644
--- a/games/hollowknight/tools/pack.py
+++ b/games/hollowknight/tools/pack.py
@@ -676,7 +676,11 @@ def main():
col_ids[b] = len(col_entries)
col_entries.append(b)
cid = 2 + col_ids[b]
- secs["SPR"].b += struct.pack("<HHffff", first_actor + i, cid, sp["lx"], sp["ty"], sp["tu"], sp["tv"])
+ # (src/hk.h: SpriteRec; its corner in 1/64 units, its texel's size a half float)
+ lx, ty = round(sp["lx"] * 64), round(sp["ty"] * 64)
+ assert -32768 <= lx < 32768 and -32768 <= ty < 32768, sp["job"].name
+ f16 = lambda v: int(np.array(v, np.float16).view(np.uint16))
+ secs["SPR"].b += struct.pack("<HHhhHH", first_actor + i, cid, lx, ty, f16(sp["tu"]), f16(sp["tv"]))
at = 4 + 4 * len(col_entries)
secs["SCOL"].b += struct.pack("<I", len(col_entries))
for b in col_entries: