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: mask shard and vessel fragment collect sequence

Mason Chenf2677c4e41d5
diff --git a/games/hollowknight/Makefile b/games/hollowknight/Makefile
index 347eac03..e5e5c918 100644
--- a/games/hollowknight/Makefile
+++ b/games/hollowknight/Makefile
@@ -9,7 +9,7 @@ CC = arm-none-eabi-gcc
NWLINK ?= npx --yes -- [email protected]
STRIP ?= arm-none-eabi-strip --strip-unneeded
BUILD_DIR = output
-GAME = src/res.c src/tex.c src/room.c src/gfx.c src/phys.c src/anim.c src/hero.c src/camera.c src/game.c src/world.c src/obj.c src/enemy.c src/hud.c src/spell.c src/text.c src/npc.c src/title.c src/vm.c src/msg.c src/save.c src/death.c src/menu.c src/inv.c src/shop.c src/lzma/LzmaDec.c
+GAME = src/res.c src/tex.c src/room.c src/gfx.c src/phys.c src/anim.c src/hero.c src/camera.c src/game.c src/world.c src/obj.c src/enemy.c src/hud.c src/spell.c src/text.c src/npc.c src/title.c src/vm.c src/msg.c src/save.c src/death.c src/menu.c src/inv.c src/shop.c src/collect.c src/lzma/LzmaDec.c
SRC = $(GAME) src/plat_eadk.c src/main.c
HEADERS = $(wildcard src/*.h) ../common/epsilon_app.h ../common/epsilon_files.h
diff --git a/games/hollowknight/src/collect.c b/games/hollowknight/src/collect.c
new file mode 100644
index 00000000..d96de9c4
--- /dev/null
+++ b/games/hollowknight/src/collect.c
@@ -0,0 +1,245 @@
+/*
+ * A mask shard or a vessel fragment got (Heart Piece Instant, Vessel Fragment Instant: the Knight's clip, the shake),
+ * then its UI (Heart Container UI, Vessel Fragment UI): the room darkened, the fleur, the piece fading in and landing,
+ * the pieces fused into a new mask (healed first) or a new vessel, the room back, the Knight's clip to its end.
+ * The UI follows the camera in front of the room, behind the HUD. (Their particles are left out.)
+ */
+#include <math.h>
+#include "game.h"
+
+#pragma GCC optimize("Os")
+
+#define DT 0.02f
+#define HUD_PX (FOCAL / (-1.342f - CAM_Z))
+#define BLANK_A 0.5176f /* (Darken: the Blanker's alpha) */
+
+enum {
+ CO_NONE, CO_GET, CO_DARKEN, CO_PIECE_IN, CO_GET_ANIM, CO_PARTICLES, CO_FUSE, CO_TWEEN, CO_GOT, CO_HEAL, CO_MAX_UP,
+ CO_FADE, CO_HERO_END
+};
+
+static const float piece_at[2][4] = COLLECT_PIECE, fleur_at[4] = COLLECT_FLEUR, mover_at[4] = COLLECT_MOVER,
+ glow_at[4] = COLLECT_GLOW, mover_to[2] = COLLECT_MOVER_TO;
+
+static struct {
+ uint8_t st, kind, pieces; /* kind: 0 a mask shard, 1 a vessel fragment; pieces: how many now (1..4, 1..3) */
+ bool piece_on, fleur_on, mover_on, glow_on;
+ float t; /* in the state */
+ float blank_a, piece_a, mover_a, fleur_a;
+ float tw; /* Tween Mover: 0..1 */
+ Anim piece, fleur, mover, glow;
+} co;
+
+bool collect_active(void) { return co.st != CO_NONE; }
+void collect_reset(void) { memset(&co, 0, sizeof co); }
+
+static void to(int st) { co.st = (uint8_t)st, co.t = 0; }
+
+/* EaseColor, linear: from a to b over time after delay */
+static float ease(float a, float b, float time, float delay) {
+ float u = (co.t - delay) / time;
+ return u <= 0 ? a : u >= 1 ? b : a + (b - a) * u;
+}
+
+/* (Get: the Knight's clip, no gravity, the shake; half a second, then the UI) */
+void collect_start(int kind) {
+ memset(&co, 0, sizeof co);
+ co.kind = (uint8_t)kind;
+ pd_set_flag(kind ? PDF_VESSEL_FRAGMENT_COLLECTED : PDF_HEART_PIECE_COLLECTED, true);
+ hero_relinquish_control();
+ hero_stop_anim_control();
+ anim_play(&g_hero.anim, CLIP_KNIGHT_COLLECT_HEART_PIECE);
+ g_hero.body.gravity_scale = 0;
+ cam_shake(SHAKE_AVERAGE);
+ g_pd.disable_pause = true;
+ to(CO_GET);
+}
+
+/* (Fleur: its clip, and the piece as it was before this one) */
+static void fleur(void) {
+ co.fleur_on = true;
+ anim_play(&co.fleur, CLIP_HEARTUI_FLEUR_APPEAR);
+ int n = co.pieces;
+ static const int16_t before[2][4] = {{CLIP_HEARTUI_GET_0, CLIP_HEARTUI_GOT_1, CLIP_HEARTUI_GOT_2, CLIP_HEARTUI_GOT_3},
+ {CLIP_VESSELUI_GET_0, CLIP_VESSELUI_GOT_1, CLIP_VESSELUI_GOT_2, CLIP_VESSELUI_GOT_2}};
+ anim_play(&co.piece, before[co.kind][n - 1 < 3 ? n - 1 : 3]);
+ co.piece_on = true;
+ /* (Piece Fade: from nothing over a second; a vessel's first, Piece Ready: there at once) */
+ co.piece_a = co.kind && n == 1 ? 1 : 0;
+ to(CO_PIECE_IN);
+}
+
+static void get_anim(void) {
+ static const int16_t get[2][4] = {{CLIP_HEARTUI_GET_1, CLIP_HEARTUI_GET_2, CLIP_HEARTUI_GET_3, CLIP_HEARTUI_GET_4},
+ {CLIP_VESSELUI_GET_1, CLIP_VESSELUI_GET_2, CLIP_VESSELUI_GET_3, CLIP_VESSELUI_GET_3}};
+ int n = co.pieces;
+ anim_play(&co.piece, get[co.kind][n - 1 < 3 ? n - 1 : 3]);
+ co.piece.events = 0;
+ to(CO_GET_ANIM);
+}
+
+void collect_tick(void) {
+ if (co.st == CO_NONE) return;
+ co.t += DT;
+ co.piece.events = co.glow.events = 0;
+ anim_update(&co.piece, DT);
+ anim_update(&co.fleur, DT);
+ anim_update(&co.mover, DT);
+ anim_update(&co.glow, DT);
+ if (co.glow_on && (co.glow.events & ANIM_DONE)) co.glow_on = false; /* (destroy_after_anim) */
+ bool heart = co.kind == 0;
+ switch (co.st) {
+ case CO_GET:
+ if (co.t >= 0.5f) {
+ /* (UI: one more piece; the UI made, its Darken) */
+ if (heart) co.pieces = ++g_pd.heart_pieces;
+ else co.pieces = ++g_pd.vessel_fragments;
+ anim_play(&co.mover, CLIP_HEARTUI_HEAD_MOVE); /* (the mover's, playing as it is made, hidden) */
+ to(CO_DARKEN);
+ }
+ break;
+ case CO_DARKEN:
+ co.blank_a = ease(0, BLANK_A, 0.5f, 0);
+ co.fleur_a = 1;
+ if (co.t >= 0.5f) fleur();
+ break;
+ case CO_PIECE_IN:
+ if (!(co.kind && co.pieces == 1)) co.piece_a = ease(0, 1, 1, 0);
+ if (co.t >= (co.kind && co.pieces == 1 ? 0.8f : 1.8f)) get_anim();
+ break;
+ case CO_GET_ANIM: {
+ /* (a mask's: at its end; a vessel's first: at its trigger; the others: at either) */
+ uint8_t ev = co.piece.events | (co.piece.playing ? 0 : ANIM_DONE);
+ bool go = heart ? (ev & ANIM_DONE) : co.pieces == 1 ? (ev & ANIM_TRIGGER) : (ev & (ANIM_DONE | ANIM_TRIGGER));
+ if (go) {
+ /* (Piece Get Particles: the glow, the shake) */
+ co.glow_on = true;
+ anim_play_from_frame(&co.glow, CLIP_SHADE_DEATH_GLOW, 0);
+ cam_shake(SHAKE_ENEMY_KILL);
+ to(CO_PARTICLES);
+ }
+ break;
+ }
+ case CO_PARTICLES:
+ if (co.t >= (heart ? 1 : 1.5f)) {
+ /* (Check Max) */
+ if (co.pieces >= (heart ? 4 : 3)) {
+ /* (Fuse: none left over; the fleur goes; a mask's mover comes) */
+ if (heart) {
+ g_pd.heart_pieces = 0;
+ anim_play(&co.piece, CLIP_HEARTUI_FUSE);
+ co.mover_on = true;
+ } else
+ g_pd.vessel_fragments = 0;
+ anim_play(&co.fleur, CLIP_HEARTUI_FLEUR_DISAPPEAR);
+ to(CO_FUSE);
+ } else
+ to(CO_FADE);
+ }
+ break;
+ case CO_FUSE:
+ if (heart) co.mover_a = ease(0, 0.4275f, 0.75f, 0);
+ else co.piece_a = ease(1, 0, 0.5f, 0);
+ if (co.t >= (heart ? 0.75f : 1)) to(CO_TWEEN);
+ break;
+ case CO_TWEEN:
+ /* (Tween Mover: the mover and the piece to the new mask's place, 0.75 s, ease in back; a vessel's: its trail's) */
+ if (heart) {
+ co.piece_a = ease(1, 0, 0.5f, 0);
+ co.mover_a = ease(0.5255f, 1, 0.5f, 0);
+ }
+ co.tw = co.t / 0.75f > 1 ? 1 : co.t / 0.75f;
+ if (co.t >= 0.75f) {
+ /* (Get: the shake; the piece and the mover gone) */
+ cam_shake(SHAKE_ENEMY_KILL);
+ co.piece_on = co.mover_on = false;
+ to(CO_GOT);
+ }
+ break;
+ case CO_GOT:
+ if (co.t >= (heart ? 0.25f : 0.25f + DT)) {
+ if (heart) to(CO_HEAL);
+ else {
+ /* (PD Max Up: a vessel more; Max Up: NEW SOUL ORB) */
+ g_pd.mp_reserve_max = (int16_t)(g_pd.mp_reserve_max + 33);
+ to(CO_MAX_UP);
+ }
+ }
+ break;
+ case CO_HEAL:
+ /* (Full Health?, then Heal 1 HP: a mask, 0.15 s, again) */
+ if (co.t == DT || co.t >= 0.15f) {
+ if (g_pd.health >= g_pd.max_health) {
+ /* (Max Up: AddToMaxHealth, all masks full; MAX HP UP) */
+ g_pd.max_health++;
+ g_pd.health = g_pd.max_health;
+ to(CO_MAX_UP);
+ } else
+ g_pd.health++, co.t = DT;
+ }
+ break;
+ case CO_MAX_UP:
+ if (co.t >= 1) to(CO_FADE);
+ break;
+ case CO_FADE:
+ /* (Fade: the piece, the fleur and the room's darkness, after half a second, over half a second) */
+ co.piece_a = co.fleur_a = ease(1, 0, 0.5f, 0.5f);
+ co.blank_a = ease(BLANK_A, 0, 0.5f, 0.5f);
+ if (co.t >= 1) {
+ co.piece_on = co.fleur_on = false;
+ anim_play(&g_hero.anim, CLIP_KNIGHT_COLLECT_HEART_PIECE_END);
+ g_hero.anim.events = 0;
+ to(CO_HERO_END);
+ }
+ break;
+ case CO_HERO_END:
+ if ((g_hero.anim.events & ANIM_DONE) || !anim_is_playing(&g_hero.anim, CLIP_KNIGHT_COLLECT_HEART_PIECE_END)) {
+ /* (Destroy Self: gravity back, control back) */
+ g_hero.body.gravity_scale = 0.79f;
+ hero_regain_control();
+ hero_start_anim_control();
+ g_pd.disable_pause = false;
+ co.st = CO_NONE;
+ }
+ break;
+ }
+}
+
+/* a piece at (x, y, z) from the camera, at scale k: on the HUD as big as in front of the room */
+static void piece(const Anim *an, float x, float y, float z, float k, float a, int slot) {
+ uint8_t al = (uint8_t)(a * 255 + 0.5f);
+ if (!al || an->sprite < 0) return;
+ float r = FOCAL / (z - CAM_Z) / HUD_PX;
+ Inst in;
+ sprite_inst(an->sprite, x * r, y * r, 0, k * r, k * r, gfx_dyn_tint(slot, 255, 255, 255, al), &in);
+ gfx_hud(&in, 0);
+}
+
+void collect_draw(void) {
+ if (co.st <= CO_GET) return;
+ /* the Blanker (in front of the room, the Knight too) */
+ uint8_t bl = (uint8_t)(co.blank_a * 255 + 0.5f);
+ if (bl) {
+ float hw = VIEW_W / 2 / HUD_PX + 1, hh = VIEW_H / 2 / HUD_PX + 1;
+ gfx_hud_fill(-hw, -hh, hw, hh, gfx_dyn_tint(2, 0, 0, 0, bl));
+ }
+ if (co.fleur_on) piece(&co.fleur, fleur_at[0], fleur_at[1], fleur_at[2], fleur_at[3], co.fleur_a, 3);
+ if (co.piece_on) {
+ const float *p = piece_at[co.kind];
+ float x = p[0], y = p[1];
+ if (co.st == CO_TWEEN && co.kind == 0) {
+ float q = co.tw, s = 1.70158f, e = q * q * ((s + 1) * q - s); /* (easeInBack) */
+ x += (mover_to[0] - x) * e, y += (mover_to[1] - y) * e;
+ }
+ piece(&co.piece, x, y, p[2], p[3], co.piece_a, 4);
+ }
+ if (co.mover_on) {
+ float x = mover_at[0], y = mover_at[1], k = mover_at[3];
+ if (co.st == CO_TWEEN) {
+ float q = co.tw, s = 1.70158f, e = q * q * ((s + 1) * q - s);
+ x += (mover_to[0] - x) * e, y += (mover_to[1] - y) * e, k += (1 - k) * e;
+ }
+ piece(&co.mover, x, y, mover_at[2], k, co.mover_a, 5);
+ }
+ if (co.glow_on) piece(&co.glow, glow_at[0], glow_at[1], glow_at[2], glow_at[3], 1, 6);
+}
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.bin
index 1af908fb..78bf9d39 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 96690e48..08779daa 100644
--- a/games/hollowknight/src/data.h
+++ b/games/hollowknight/src/data.h
@@ -190,424 +190,442 @@
#define CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_DOWN 130
#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_UP 131
#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_DOWN 132
-#define CLIP_GEOBUG_LAMP_BUG_IDLE 133
-#define CLIP_DIALOGUE_ARROW_UP 134
-#define CLIP_DIALOGUE_ARROW_DOWN 135
-#define CLIP_DIALOGUE_STOP_UP 136
-#define CLIP_DIALOGUE_STOP_DOWN 137
-#define CLIP_DIALOGUE_FLEUR_TOP_UP 138
-#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 139
-#define CLIP_DIALOGUE_FLEUR_BOT_UP 140
-#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 141
-#define CLIP_DIALOGUE_DREAM_UP 142
-#define CLIP_DIALOGUE_DREAM_DOWN 143
-#define CLIP_PROMPT_BLANK 144
-#define CLIP_PROMPT_DOWN 145
-#define CLIP_PROMPT_ENTER_DOWN 146
-#define CLIP_PROMPT_ENTER_IDLE 147
-#define CLIP_PROMPT_ENTER_UP 148
-#define CLIP_PROMPT_IDLE 149
-#define CLIP_PROMPT_LISTEN_DOWN 150
-#define CLIP_PROMPT_LISTEN_IDLE 151
-#define CLIP_PROMPT_LISTEN_UP 152
-#define CLIP_PROMPT_UP 153
-#define CLIP_SHADE_APPEAR 154
-#define CLIP_SHADE_CAST 155
-#define CLIP_SHADE_CAST_ANTIC 156
-#define CLIP_SHADE_CAST_CHARGE 157
-#define CLIP_SHADE_CAST_RING 158
-#define CLIP_SHADE_DEATH 159
-#define CLIP_SHADE_DEATH_GLOW 160
-#define CLIP_SHADE_DEATH_START 161
-#define CLIP_SHADE_DEPART 162
-#define CLIP_SHADE_FIREBALL 163
-#define CLIP_SHADE_FIREBALL_END 164
-#define CLIP_SHADE_FLY 165
-#define CLIP_SHADE_IDLE 166
-#define CLIP_SHADE_RETREAT_END 167
-#define CLIP_SHADE_RETREAT_START 168
-#define CLIP_SHADE_SLASH 169
-#define CLIP_SHADE_SLASH_ANTIC 170
-#define CLIP_SHADE_SLASH_CD 171
-#define CLIP_SHADE_SLASH_EFFECT 172
-#define CLIP_SHADE_STARTLE 173
-#define CLIP_SHADE_TURNTOFLY 174
-#define CLIP_SHADE_TURNTOIDLE 175
-#define CLIP_CRAWLER_WALK 176
-#define CLIP_CRAWLER_TURN 177
-#define CLIP_CRAWLER_IDLE 178
-#define CLIP_CRAWLER_DEATH_AIR 179
-#define CLIP_CRAWLER_DEATH_LAND 180
-#define CLIP_BUZZER_CHASE 181
-#define CLIP_BUZZER_IDLE 182
-#define CLIP_BUZZER_STARTLE 183
-#define CLIP_BUZZER_DEATH_AIR 184
-#define CLIP_BUZZER_DEATH_LAND 185
-#define CLIP_BUZZER_FLY 186
-#define CLIP_BUZZER_TURNTOFLY 187
-#define CLIP_BUZZER_TURNTOIDLE 188
-#define CLIP_TIKTIK_DEATH_AIR 189
-#define CLIP_TIKTIK_DEATH_LAND 190
-#define CLIP_TIKTIK_STUN 191
-#define CLIP_TIKTIK_WALK 192
-#define CLIP_GRUZZER_DEATH_AIR 193
-#define CLIP_GRUZZER_DEATH_LAND 194
-#define CLIP_GRUZZER_FLY 195
-#define CLIP_ASPID_DEATH_AIR 196
-#define CLIP_ASPID_FIRE_LONG 197
-#define CLIP_ASPID_FLY 198
-#define CLIP_ASPID_TURNTOFLY 199
-#define CLIP_BALDUR_DEATH_AIR 200
-#define CLIP_BALDUR_DEATH_LAND 201
-#define CLIP_BALDUR_IDLE 202
-#define CLIP_BALDUR_ROLL 203
-#define CLIP_BALDUR_START 204
-#define CLIP_BALDUR_STOP 205
-#define CLIP_ELDERBALDUR_CLOSE1 206
-#define CLIP_ELDERBALDUR_CLOSE2 207
-#define CLIP_ELDERBALDUR_CLOSED 208
-#define CLIP_ELDERBALDUR_DEATH 209
-#define CLIP_ELDERBALDUR_DEATH_STUN 210
-#define CLIP_ELDERBALDUR_HIT 211
-#define CLIP_ELDERBALDUR_IDLE 212
-#define CLIP_ELDERBALDUR_OPEN 213
-#define CLIP_ELDERBALDUR_SHOOT_ANTIC 214
-#define CLIP_ELDERBALDUR_SHOOT_CD 215
-#define CLIP_HUSK_ATTACK_ANTICIPATE 216
-#define CLIP_HUSK_ATTACK_COOLDOWN 217
-#define CLIP_HUSK_ATTACK_LUNGE 218
-#define CLIP_HUSK_DEATH_AIR 219
-#define CLIP_HUSK_DEATH_LAND 220
-#define CLIP_HUSK_IDLE 221
-#define CLIP_HUSK_TURN 222
-#define CLIP_HUSK_WALK 223
-#define CLIP_BARGER_ATTACK_ANTICIPATE 224
-#define CLIP_BARGER_ATTACK_COOLDOWN 225
-#define CLIP_BARGER_ATTACK_LUNGE 226
-#define CLIP_BARGER_DEATH_AIR 227
-#define CLIP_BARGER_DEATH_LAND 228
-#define CLIP_BARGER_IDLE 229
-#define CLIP_BARGER_TURN 230
-#define CLIP_BARGER_WALK 231
-#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 232
-#define CLIP_HORNHEAD_ATTACK_COOLDOWN 233
-#define CLIP_HORNHEAD_ATTACK_LUNGE 234
-#define CLIP_HORNHEAD_DEATH_AIR 235
-#define CLIP_HORNHEAD_DEATH_LAND 236
-#define CLIP_HORNHEAD_IDLE 237
-#define CLIP_HORNHEAD_TURN 238
-#define CLIP_HORNHEAD_WALK 239
-#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 240
-#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 241
-#define CLIP_MOSSRUNNER_ATTACK_LUNGE 242
-#define CLIP_MOSSRUNNER_DEATH_AIR 243
-#define CLIP_MOSSRUNNER_DEATH_LAND 244
-#define CLIP_MOSSRUNNER_IDLE 245
-#define CLIP_MOSSRUNNER_TURN 246
-#define CLIP_MOSSRUNNER_WALK 247
-#define CLIP_LEAPER_ATTACK 248
-#define CLIP_LEAPER_DEATH_AIR 249
-#define CLIP_LEAPER_DEATH_LAND 250
-#define CLIP_LEAPER_IDLE 251
-#define CLIP_LEAPER_LAND 252
-#define CLIP_LEAPER_TURN 253
-#define CLIP_LEAPER_WALK 254
-#define CLIP_GUARD_ANTICIPATE 255
-#define CLIP_GUARD_ATTACK2 256
-#define CLIP_GUARD_DEATH_AIR 257
-#define CLIP_GUARD_DEATH_LAND 258
-#define CLIP_GUARD_DORMANT 259
-#define CLIP_GUARD_IDLE 260
-#define CLIP_GUARD_RUN 261
-#define CLIP_GUARD_STARTLE 262
-#define CLIP_GUARD_STOMP_ANTIC 263
-#define CLIP_GUARD_STOMP_JUMP 264
-#define CLIP_GUARD_STOMP_LAND 265
-#define CLIP_GUARD_STOP_RUN 266
-#define CLIP_GUARD_STOP_WALK 267
-#define CLIP_GUARD_SWIPE 268
-#define CLIP_GUARD_TURN 269
-#define CLIP_GUARD_WAKE 270
-#define CLIP_GUARD_WALK 271
-#define CLIP_FK_ATTACK 272
-#define CLIP_FK_ATTACK_ANTIC 273
-#define CLIP_FK_ATTACK_RECOVER 274
-#define CLIP_FK_BLANK 275
-#define CLIP_FK_BODY 276
-#define CLIP_FK_DEATH_FALL 277
-#define CLIP_FK_DEATH_HEAD_1 278
-#define CLIP_FK_DEATH_HEAD_2 279
-#define CLIP_FK_DEATH_LAND 280
-#define CLIP_FK_DEATH_SPAZ 281
-#define CLIP_FK_IDLE 282
-#define CLIP_FK_JUMP 283
-#define CLIP_FK_JUMP_ANTIC 284
-#define CLIP_FK_JUMP_ATTACK_HIT_1 285
-#define CLIP_FK_JUMP_ATTACK_HIT_2 286
-#define CLIP_FK_JUMP_ATTACK_HIT_3 287
-#define CLIP_FK_JUMP_ATTACK_UP 288
-#define CLIP_FK_LAND 289
-#define CLIP_FK_RAGE 290
-#define CLIP_FK_RUN 291
-#define CLIP_FK_RUN_ANTIC 292
-#define CLIP_FK_STUN_HIT 293
-#define CLIP_FK_STUN_OPEN 294
-#define CLIP_FK_STUN_OPENED 295
-#define CLIP_FK_STUN_RECOVER 296
-#define CLIP_FK_STUN_ROLL 297
-#define CLIP_FK_STUN_ROLL_END 298
-#define CLIP_FK_TURN 299
-#define CLIP_FKHEAD_DEATH_LAND 300
-#define CLIP_FKHEAD_HEAD_HIT 301
-#define CLIP_FKHEAD_HEAD_IDLE 302
-#define CLIP_FKHEAD_HEAD_SPAZ 303
-#define CLIP_HATCHER_DEATH_AIR 304
-#define CLIP_HATCHER_DEATH_LAND 305
-#define CLIP_HATCHER_FIRE 306
-#define CLIP_HATCHER_FLY 307
-#define CLIP_HATCHLING_FLY 308
-#define CLIP_SLUG_BOUNCE 309
-#define CLIP_SLUG_DEATH_AIR 310
-#define CLIP_SLUG_DEATH_LAND 311
-#define CLIP_SLUG_IDLE_TODOWN 312
-#define CLIP_SLUG_IDLE_TOUP 313
-#define CLIP_SLUG_IDLE_UP 314
-#define CLIP_SLUG_RUN 315
-#define CLIP_SLUG_STARTLE 316
-#define CLIP_GFLY_BURST 317
-#define CLIP_GFLY_CHARGE 318
-#define CLIP_GFLY_CHARGE_ANTIC 319
-#define CLIP_GFLY_CHARGE_RECOVER 320
-#define CLIP_GFLY_DEATH 321
-#define CLIP_GFLY_FALL 322
-#define CLIP_GFLY_FLY 323
-#define CLIP_GFLY_GURGLE_LOOP 324
-#define CLIP_GFLY_GURGLE_ONCE 325
-#define CLIP_GFLY_SLAM_DOWN 326
-#define CLIP_GFLY_SLAM_END 327
-#define CLIP_GFLY_SLAM_UP 328
-#define CLIP_GFLY_SLEEP 329
-#define CLIP_GFLY_STOP 330
-#define CLIP_GFLY_WAKE 331
-#define CLIP_GFLY_WIGGLE 332
-#define CLIP_MOSSWALKER_APPEAR 333
-#define CLIP_MOSSWALKER_BURY 334
-#define CLIP_MOSSWALKER_DEATH_AIR 335
-#define CLIP_MOSSWALKER_DEATH_LAND 336
-#define CLIP_MOSSWALKER_SHAKE 337
-#define CLIP_MOSSWALKER_TURN 338
-#define CLIP_MOSSWALKER_WALK 339
-#define CLIP_PIGEON_FLY 340
-#define CLIP_PIGEON_IDLE_01 341
-#define CLIP_PIGEON_IDLE_02 342
-#define CLIP_PIGEON_IDLE_03 343
-#define CLIP_PLANTTRAP_DEATH 344
-#define CLIP_PLANTTRAP_IDLE 345
-#define CLIP_PLANTTRAP_RETRACT 346
-#define CLIP_PLANTTRAP_SNAP 347
-#define CLIP_PLANTTRAP_SNAP_READY 348
-#define CLIP_SHAKER_ATTACK 349
-#define CLIP_SHAKER_DEATH_AIR 350
-#define CLIP_SHAKER_DEATH_LAND 351
-#define CLIP_SHAKER_IDLE 352
-#define CLIP_SHAKER_TURN 353
-#define CLIP_SHAKER_WALK 354
-#define CLIP_MOSQUITO_ATTACK 355
-#define CLIP_MOSQUITO_ATTACK_ANTIC 356
-#define CLIP_MOSQUITO_DEATH_AIR 357
-#define CLIP_MOSQUITO_DEATH_LAND 358
-#define CLIP_MOSQUITO_IDLE 359
-#define CLIP_MOSQUITO_STARTLE 360
-#define CLIP_MOSQUITO_TURNTOIDLE 361
-#define CLIP_FATFLY_ATTACK 362
-#define CLIP_FATFLY_DEATH_AIR 363
-#define CLIP_FATFLY_DEATH_LAND 364
-#define CLIP_FATFLY_FLY 365
-#define CLIP_MOSSCHARGER_APPEAR 366
-#define CLIP_MOSSCHARGER_CHARGE 367
-#define CLIP_MOSSCHARGER_DEATH_AIR 368
-#define CLIP_MOSSCHARGER_DEATH_LAND 369
-#define CLIP_MOSSCHARGER_DISAPPEAR 370
-#define CLIP_MOSSCHARGER_ESCAPE 371
-#define CLIP_MOSSCHARGER_GET_UP 372
-#define CLIP_MOSSCHARGER_STUN 373
-#define CLIP_MOSSCHARGER_TURNRUN 374
-#define CLIP_MOSSKNIGHT_DEATH_AIR 375
-#define CLIP_MOSSKNIGHT_DEATH_LAND 376
-#define CLIP_MOSSKNIGHT_DORMANT_1 377
-#define CLIP_MOSSKNIGHT_DORMANT_2 378
-#define CLIP_MOSSKNIGHT_EVADE 379
-#define CLIP_MOSSKNIGHT_IDLE 380
-#define CLIP_MOSSKNIGHT_SHAKE 381
-#define CLIP_MOSSKNIGHT_SHIELD_FRONT 382
-#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 383
-#define CLIP_MOSSKNIGHT_SHIELD_TOP 384
-#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 385
-#define CLIP_MOSSKNIGHT_SHOOT 386
-#define CLIP_MOSSKNIGHT_SHOOT_END 387
-#define CLIP_MOSSKNIGHT_SLASH 388
-#define CLIP_MOSSKNIGHT_SLASH_2 389
-#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 390
-#define CLIP_MOSSKNIGHT_SLASH_EFFECT 391
-#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 392
-#define CLIP_MOSSKNIGHT_SLASH_END 393
-#define CLIP_MOSSKNIGHT_SLASH_QUICK 394
-#define CLIP_MOSSKNIGHT_TURN 395
-#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 396
-#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 397
-#define CLIP_MOSSKNIGHT_WAKE 398
-#define CLIP_MOSSKNIGHT_WALK 399
-#define CLIP_HORNET_A_DASH 400
-#define CLIP_HORNET_A_DASH_ANTIC 401
-#define CLIP_HORNET_AIR_DASH_EFFECT 402
-#define CLIP_HORNET_DEATH_AIR 403
-#define CLIP_HORNET_EVADE 404
-#define CLIP_HORNET_EVADE_ANTIC 405
-#define CLIP_HORNET_FALL 406
-#define CLIP_HORNET_FLASH 407
-#define CLIP_HORNET_FLOURISH 408
-#define CLIP_HORNET_G_DASH 409
-#define CLIP_HORNET_G_DASH_ANTIC 410
-#define CLIP_HORNET_G_DASH_EFFECT 411
-#define CLIP_HORNET_G_DASH_RECOVER1 412
-#define CLIP_HORNET_G_DASH_RECOVER2 413
-#define CLIP_HORNET_HARD_LAND 414
-#define CLIP_HORNET_IDLE 415
-#define CLIP_HORNET_JUMP 416
-#define CLIP_HORNET_JUMP_ANTIC 417
-#define CLIP_HORNET_LAND 418
-#define CLIP_HORNET_NEEDLE 419
-#define CLIP_HORNET_NEEDLE_THREAD 420
-#define CLIP_HORNET_RUN 421
-#define CLIP_HORNET_SPHERE_ANTIC_A 422
-#define CLIP_HORNET_SPHERE_ANTIC_G 423
-#define CLIP_HORNET_SPHERE_ATTACK 424
-#define CLIP_HORNET_SPHERE_BALL 425
-#define CLIP_HORNET_SPHERE_RECOVER_A 426
-#define CLIP_HORNET_SPHERE_RECOVER_G 427
-#define CLIP_HORNET_STUN 428
-#define CLIP_HORNET_STUN_AIR 429
-#define CLIP_HORNET_THROW 430
-#define CLIP_HORNET_THROW_ANTIC 431
-#define CLIP_HORNET_THROW_EFFECT 432
-#define CLIP_HORNET_THROW_RECOVER 433
-#define CLIP_HORNET_WALL_IMPACT 434
-#define CLIP_HORNET_WOUNDED 435
-#define CLIP_BGATE_BG_OPENED 436
-#define CLIP_BGATE_BG_CLOSE_1 437
-#define CLIP_BGATE_BG_CLOSE_2 438
-#define CLIP_BGATE_BG_OPEN 439
-#define CLIP_BGATE_BG_CLOSED 440
-#define CLIP_BGATE_BONE_GATE_OPENED 441
-#define CLIP_BGATE_BONE_GATE_CLOSE 442
-#define CLIP_BGATE_BONE_GATE_CLOSED 443
-#define CLIP_BGATE_BONE_GATE_OPEN 444
-#define CLIP_COCOON_COCOON_IDLE 445
-#define CLIP_COCOON_COCOON_SWEAT 446
-#define CLIP_COCOON_SCUTTLER_LAND 447
-#define CLIP_COCOON_SCUTTLER_RUN 448
-#define CLIP_FX_SPLAT 449
-#define CLIP_FX_SPLAT2 450
-#define CLIP_FIREBALL_BLAST 451
-#define CLIP_FIREBALL_BALL 452
-#define CLIP_FIREBALL_BALL_END 453
-#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 454
-#define CLIP_DRIP_IDLE 455
-#define CLIP_DRIP_DRIP 456
-#define CLIP_DRIP_FALL 457
-#define CLIP_DRIP_IMPACT 458
-#define CLIP_HORNETCS_EVADE 459
-#define CLIP_HORNETCS_EVADE_ANTIC 460
-#define CLIP_HORNETCS_FALL 461
-#define CLIP_HORNETCS_HARPOON_SIDE 462
-#define CLIP_HORNETCS_IDLE 463
-#define CLIP_HORNETCS_JUMP_FULL 464
-#define CLIP_HORNETCS_POINT 465
-#define CLIP_HORNETCS_RUN 466
-#define CLIP_HORNETCS_SOFT_LAND 467
-#define CLIP_HORNETCS_THREAD_1 468
-#define CLIP_HORNETCS_THROW_SIDE 469
-#define CLIP_HORNETCS_THROW_SIDE_START 470
-#define CLIP_HORNETCS_TURN 471
-#define CLIP_HORNETCS_TURNTOIDLE 472
-#define CLIP_BULLET_IDLE 473
-#define CLIP_BULLET_IMPACT 474
-#define CLIP_BULLET_SHOCKWAVE_SPURT 475
-#define CLIP_PROP0_WATERFALL_LOOP 476
-#define CLIP_PROP1_TORCH2 477
-#define CLIP_PROP1_TORCH3 478
-#define CLIP_VM0_FLOWER 479
-#define CLIP_VM0_IDLE 480
-#define CLIP_VM0_REACH 481
-#define CLIP_VM0_REACH_TO_IDLE 482
-#define CLIP_VM0_TALK_LEFT 483
-#define CLIP_VM0_TALK_RIGHT 484
-#define CLIP_VM0_TURN_LEFT 485
-#define CLIP_VM0_TURN_RIGHT 486
-#define CLIP_VM2_IDLE 487
-#define CLIP_VM2_LOOKLEFT 488
-#define CLIP_VM2_LOOKRIGHT 489
-#define CLIP_VM3_IDLE 490
-#define CLIP_VM3_TALK 491
-#define CLIP_VM3_TALK_END 492
-#define CLIP_VM4_IDLE 493
-#define CLIP_VM4_LOOKLEFT 494
-#define CLIP_VM4_LOOKRIGHT 495
-#define CLIP_VM4_SIT 496
-#define CLIP_VM4_SIT_TALK 497
-#define CLIP_VM4_SIT_TALK_END 498
-#define CLIP_VM5_DAZED 499
-#define CLIP_VM5_IDLE 500
-#define CLIP_VM5_TURN_L 501
-#define CLIP_VM5_TURN_R 502
-#define CLIP_VM5_WAKE 503
-#define CLIP_VM8_HEGEMOL_CAST 504
-#define CLIP_VM8_HEGEMOL_IDLE 505
-#define CLIP_VM8_LURIEN_CAST 506
-#define CLIP_VM8_LURIEN_IDLE 507
-#define CLIP_VM8_MONOMON_CAST 508
-#define CLIP_VM8_MONOMON_IDLE 509
-#define CLIP_VM9_IDLE 510
-#define CLIP_VM9_SIT_IDLE 511
-#define CLIP_VM9_SIT_TALK 512
-#define CLIP_VM9_SIT_TALK_END 513
-#define CLIP_VM9_SUMMON 514
-#define CLIP_VM9_TALK 515
-#define CLIP_VM9_TALK_END 516
-#define CLIP_VM9_TURN 517
-#define CLIP_VM11_IDLE 518
-#define CLIP_VM11_LOOK_LEFT 519
-#define CLIP_VM11_LOOK_RIGHT 520
-#define CLIP_VM11_TALK_CONVO_END 521
-#define CLIP_VM11_TALK_CONVO_START 522
-#define CLIP_VM11_TALK_SHOP_END 523
-#define CLIP_VM11_TALK_SHOP_START 524
-#define CLIP_VM12_IDLE 525
-#define CLIP_VM12_SHOP_END 526
-#define CLIP_VM12_SHOP_START 527
-#define CLIP_VM12_TALK_END 528
-#define CLIP_VM12_TALK_START 529
-#define CLIP_VM13_CRY 530
-#define CLIP_VM13_CRY_TURN 531
-#define CLIP_VM13_FREED 532
-#define CLIP_VM13_HOME_BOUNCE 533
-#define CLIP_VM13_HOME_WAVE 534
-#define CLIP_VM13_IDLE 535
-#define CLIP_VM14_BECKON 536
-#define CLIP_VM14_CHEER 537
-#define CLIP_VM14_CRY 538
-#define CLIP_VM14_GIFT 539
-#define CLIP_VM14_IDLE 540
-#define CLIP_ANIM0_DASH_CLOAK_CORPSE000 541
-#define CLIP_ANIM1_GROUND_PLINK_0 542
-#define CLIP_ANIM2_FIREBALL_COLLECT_ANIM 543
-#define SPRITE_HERO_LIGHT 2515
-#define SPRITE_DIALOGUE_BACKBOARD 2516
-#define SPRITE_PROMPT_SHADOW 2517
-#define SPRITE_CORPSE_NAIL 2518
-#define SPRITE_FK_BARREL 2519
-#define SPRITE_FK_STAFF 2520
-#define SPRITE_DIGIT0 2850
+#define CLIP_HEARTUI_FLEUR_APPEAR 133
+#define CLIP_HEARTUI_FLEUR_DISAPPEAR 134
+#define CLIP_HEARTUI_GET_0 135
+#define CLIP_HEARTUI_GET_1 136
+#define CLIP_HEARTUI_GET_2 137
+#define CLIP_HEARTUI_GET_3 138
+#define CLIP_HEARTUI_GET_4 139
+#define CLIP_HEARTUI_GOT_1 140
+#define CLIP_HEARTUI_GOT_2 141
+#define CLIP_HEARTUI_GOT_3 142
+#define CLIP_HEARTUI_FUSE 143
+#define CLIP_HEARTUI_HEAD_MOVE 144
+#define CLIP_VESSELUI_GET_0 145
+#define CLIP_VESSELUI_GET_1 146
+#define CLIP_VESSELUI_GET_2 147
+#define CLIP_VESSELUI_GET_3 148
+#define CLIP_VESSELUI_GOT_1 149
+#define CLIP_VESSELUI_GOT_2 150
+#define CLIP_GEOBUG_LAMP_BUG_IDLE 151
+#define CLIP_DIALOGUE_ARROW_UP 152
+#define CLIP_DIALOGUE_ARROW_DOWN 153
+#define CLIP_DIALOGUE_STOP_UP 154
+#define CLIP_DIALOGUE_STOP_DOWN 155
+#define CLIP_DIALOGUE_FLEUR_TOP_UP 156
+#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 157
+#define CLIP_DIALOGUE_FLEUR_BOT_UP 158
+#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 159
+#define CLIP_DIALOGUE_DREAM_UP 160
+#define CLIP_DIALOGUE_DREAM_DOWN 161
+#define CLIP_PROMPT_BLANK 162
+#define CLIP_PROMPT_DOWN 163
+#define CLIP_PROMPT_ENTER_DOWN 164
+#define CLIP_PROMPT_ENTER_IDLE 165
+#define CLIP_PROMPT_ENTER_UP 166
+#define CLIP_PROMPT_IDLE 167
+#define CLIP_PROMPT_LISTEN_DOWN 168
+#define CLIP_PROMPT_LISTEN_IDLE 169
+#define CLIP_PROMPT_LISTEN_UP 170
+#define CLIP_PROMPT_UP 171
+#define CLIP_SHADE_APPEAR 172
+#define CLIP_SHADE_CAST 173
+#define CLIP_SHADE_CAST_ANTIC 174
+#define CLIP_SHADE_CAST_CHARGE 175
+#define CLIP_SHADE_CAST_RING 176
+#define CLIP_SHADE_DEATH 177
+#define CLIP_SHADE_DEATH_GLOW 178
+#define CLIP_SHADE_DEATH_START 179
+#define CLIP_SHADE_DEPART 180
+#define CLIP_SHADE_FIREBALL 181
+#define CLIP_SHADE_FIREBALL_END 182
+#define CLIP_SHADE_FLY 183
+#define CLIP_SHADE_IDLE 184
+#define CLIP_SHADE_RETREAT_END 185
+#define CLIP_SHADE_RETREAT_START 186
+#define CLIP_SHADE_SLASH 187
+#define CLIP_SHADE_SLASH_ANTIC 188
+#define CLIP_SHADE_SLASH_CD 189
+#define CLIP_SHADE_SLASH_EFFECT 190
+#define CLIP_SHADE_STARTLE 191
+#define CLIP_SHADE_TURNTOFLY 192
+#define CLIP_SHADE_TURNTOIDLE 193
+#define CLIP_CRAWLER_WALK 194
+#define CLIP_CRAWLER_TURN 195
+#define CLIP_CRAWLER_IDLE 196
+#define CLIP_CRAWLER_DEATH_AIR 197
+#define CLIP_CRAWLER_DEATH_LAND 198
+#define CLIP_BUZZER_CHASE 199
+#define CLIP_BUZZER_IDLE 200
+#define CLIP_BUZZER_STARTLE 201
+#define CLIP_BUZZER_DEATH_AIR 202
+#define CLIP_BUZZER_DEATH_LAND 203
+#define CLIP_BUZZER_FLY 204
+#define CLIP_BUZZER_TURNTOFLY 205
+#define CLIP_BUZZER_TURNTOIDLE 206
+#define CLIP_TIKTIK_DEATH_AIR 207
+#define CLIP_TIKTIK_DEATH_LAND 208
+#define CLIP_TIKTIK_STUN 209
+#define CLIP_TIKTIK_WALK 210
+#define CLIP_GRUZZER_DEATH_AIR 211
+#define CLIP_GRUZZER_DEATH_LAND 212
+#define CLIP_GRUZZER_FLY 213
+#define CLIP_ASPID_DEATH_AIR 214
+#define CLIP_ASPID_FIRE_LONG 215
+#define CLIP_ASPID_FLY 216
+#define CLIP_ASPID_TURNTOFLY 217
+#define CLIP_BALDUR_DEATH_AIR 218
+#define CLIP_BALDUR_DEATH_LAND 219
+#define CLIP_BALDUR_IDLE 220
+#define CLIP_BALDUR_ROLL 221
+#define CLIP_BALDUR_START 222
+#define CLIP_BALDUR_STOP 223
+#define CLIP_ELDERBALDUR_CLOSE1 224
+#define CLIP_ELDERBALDUR_CLOSE2 225
+#define CLIP_ELDERBALDUR_CLOSED 226
+#define CLIP_ELDERBALDUR_DEATH 227
+#define CLIP_ELDERBALDUR_DEATH_STUN 228
+#define CLIP_ELDERBALDUR_HIT 229
+#define CLIP_ELDERBALDUR_IDLE 230
+#define CLIP_ELDERBALDUR_OPEN 231
+#define CLIP_ELDERBALDUR_SHOOT_ANTIC 232
+#define CLIP_ELDERBALDUR_SHOOT_CD 233
+#define CLIP_HUSK_ATTACK_ANTICIPATE 234
+#define CLIP_HUSK_ATTACK_COOLDOWN 235
+#define CLIP_HUSK_ATTACK_LUNGE 236
+#define CLIP_HUSK_DEATH_AIR 237
+#define CLIP_HUSK_DEATH_LAND 238
+#define CLIP_HUSK_IDLE 239
+#define CLIP_HUSK_TURN 240
+#define CLIP_HUSK_WALK 241
+#define CLIP_BARGER_ATTACK_ANTICIPATE 242
+#define CLIP_BARGER_ATTACK_COOLDOWN 243
+#define CLIP_BARGER_ATTACK_LUNGE 244
+#define CLIP_BARGER_DEATH_AIR 245
+#define CLIP_BARGER_DEATH_LAND 246
+#define CLIP_BARGER_IDLE 247
+#define CLIP_BARGER_TURN 248
+#define CLIP_BARGER_WALK 249
+#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 250
+#define CLIP_HORNHEAD_ATTACK_COOLDOWN 251
+#define CLIP_HORNHEAD_ATTACK_LUNGE 252
+#define CLIP_HORNHEAD_DEATH_AIR 253
+#define CLIP_HORNHEAD_DEATH_LAND 254
+#define CLIP_HORNHEAD_IDLE 255
+#define CLIP_HORNHEAD_TURN 256
+#define CLIP_HORNHEAD_WALK 257
+#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 258
+#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 259
+#define CLIP_MOSSRUNNER_ATTACK_LUNGE 260
+#define CLIP_MOSSRUNNER_DEATH_AIR 261
+#define CLIP_MOSSRUNNER_DEATH_LAND 262
+#define CLIP_MOSSRUNNER_IDLE 263
+#define CLIP_MOSSRUNNER_TURN 264
+#define CLIP_MOSSRUNNER_WALK 265
+#define CLIP_LEAPER_ATTACK 266
+#define CLIP_LEAPER_DEATH_AIR 267
+#define CLIP_LEAPER_DEATH_LAND 268
+#define CLIP_LEAPER_IDLE 269
+#define CLIP_LEAPER_LAND 270
+#define CLIP_LEAPER_TURN 271
+#define CLIP_LEAPER_WALK 272
+#define CLIP_GUARD_ANTICIPATE 273
+#define CLIP_GUARD_ATTACK2 274
+#define CLIP_GUARD_DEATH_AIR 275
+#define CLIP_GUARD_DEATH_LAND 276
+#define CLIP_GUARD_DORMANT 277
+#define CLIP_GUARD_IDLE 278
+#define CLIP_GUARD_RUN 279
+#define CLIP_GUARD_STARTLE 280
+#define CLIP_GUARD_STOMP_ANTIC 281
+#define CLIP_GUARD_STOMP_JUMP 282
+#define CLIP_GUARD_STOMP_LAND 283
+#define CLIP_GUARD_STOP_RUN 284
+#define CLIP_GUARD_STOP_WALK 285
+#define CLIP_GUARD_SWIPE 286
+#define CLIP_GUARD_TURN 287
+#define CLIP_GUARD_WAKE 288
+#define CLIP_GUARD_WALK 289
+#define CLIP_FK_ATTACK 290
+#define CLIP_FK_ATTACK_ANTIC 291
+#define CLIP_FK_ATTACK_RECOVER 292
+#define CLIP_FK_BLANK 293
+#define CLIP_FK_BODY 294
+#define CLIP_FK_DEATH_FALL 295
+#define CLIP_FK_DEATH_HEAD_1 296
+#define CLIP_FK_DEATH_HEAD_2 297
+#define CLIP_FK_DEATH_LAND 298
+#define CLIP_FK_DEATH_SPAZ 299
+#define CLIP_FK_IDLE 300
+#define CLIP_FK_JUMP 301
+#define CLIP_FK_JUMP_ANTIC 302
+#define CLIP_FK_JUMP_ATTACK_HIT_1 303
+#define CLIP_FK_JUMP_ATTACK_HIT_2 304
+#define CLIP_FK_JUMP_ATTACK_HIT_3 305
+#define CLIP_FK_JUMP_ATTACK_UP 306
+#define CLIP_FK_LAND 307
+#define CLIP_FK_RAGE 308
+#define CLIP_FK_RUN 309
+#define CLIP_FK_RUN_ANTIC 310
+#define CLIP_FK_STUN_HIT 311
+#define CLIP_FK_STUN_OPEN 312
+#define CLIP_FK_STUN_OPENED 313
+#define CLIP_FK_STUN_RECOVER 314
+#define CLIP_FK_STUN_ROLL 315
+#define CLIP_FK_STUN_ROLL_END 316
+#define CLIP_FK_TURN 317
+#define CLIP_FKHEAD_DEATH_LAND 318
+#define CLIP_FKHEAD_HEAD_HIT 319
+#define CLIP_FKHEAD_HEAD_IDLE 320
+#define CLIP_FKHEAD_HEAD_SPAZ 321
+#define CLIP_HATCHER_DEATH_AIR 322
+#define CLIP_HATCHER_DEATH_LAND 323
+#define CLIP_HATCHER_FIRE 324
+#define CLIP_HATCHER_FLY 325
+#define CLIP_HATCHLING_FLY 326
+#define CLIP_SLUG_BOUNCE 327
+#define CLIP_SLUG_DEATH_AIR 328
+#define CLIP_SLUG_DEATH_LAND 329
+#define CLIP_SLUG_IDLE_TODOWN 330
+#define CLIP_SLUG_IDLE_TOUP 331
+#define CLIP_SLUG_IDLE_UP 332
+#define CLIP_SLUG_RUN 333
+#define CLIP_SLUG_STARTLE 334
+#define CLIP_GFLY_BURST 335
+#define CLIP_GFLY_CHARGE 336
+#define CLIP_GFLY_CHARGE_ANTIC 337
+#define CLIP_GFLY_CHARGE_RECOVER 338
+#define CLIP_GFLY_DEATH 339
+#define CLIP_GFLY_FALL 340
+#define CLIP_GFLY_FLY 341
+#define CLIP_GFLY_GURGLE_LOOP 342
+#define CLIP_GFLY_GURGLE_ONCE 343
+#define CLIP_GFLY_SLAM_DOWN 344
+#define CLIP_GFLY_SLAM_END 345
+#define CLIP_GFLY_SLAM_UP 346
+#define CLIP_GFLY_SLEEP 347
+#define CLIP_GFLY_STOP 348
+#define CLIP_GFLY_WAKE 349
+#define CLIP_GFLY_WIGGLE 350
+#define CLIP_MOSSWALKER_APPEAR 351
+#define CLIP_MOSSWALKER_BURY 352
+#define CLIP_MOSSWALKER_DEATH_AIR 353
+#define CLIP_MOSSWALKER_DEATH_LAND 354
+#define CLIP_MOSSWALKER_SHAKE 355
+#define CLIP_MOSSWALKER_TURN 356
+#define CLIP_MOSSWALKER_WALK 357
+#define CLIP_PIGEON_FLY 358
+#define CLIP_PIGEON_IDLE_01 359
+#define CLIP_PIGEON_IDLE_02 360
+#define CLIP_PIGEON_IDLE_03 361
+#define CLIP_PLANTTRAP_DEATH 362
+#define CLIP_PLANTTRAP_IDLE 363
+#define CLIP_PLANTTRAP_RETRACT 364
+#define CLIP_PLANTTRAP_SNAP 365
+#define CLIP_PLANTTRAP_SNAP_READY 366
+#define CLIP_SHAKER_ATTACK 367
+#define CLIP_SHAKER_DEATH_AIR 368
+#define CLIP_SHAKER_DEATH_LAND 369
+#define CLIP_SHAKER_IDLE 370
+#define CLIP_SHAKER_TURN 371
+#define CLIP_SHAKER_WALK 372
+#define CLIP_MOSQUITO_ATTACK 373
+#define CLIP_MOSQUITO_ATTACK_ANTIC 374
+#define CLIP_MOSQUITO_DEATH_AIR 375
+#define CLIP_MOSQUITO_DEATH_LAND 376
+#define CLIP_MOSQUITO_IDLE 377
+#define CLIP_MOSQUITO_STARTLE 378
+#define CLIP_MOSQUITO_TURNTOIDLE 379
+#define CLIP_FATFLY_ATTACK 380
+#define CLIP_FATFLY_DEATH_AIR 381
+#define CLIP_FATFLY_DEATH_LAND 382
+#define CLIP_FATFLY_FLY 383
+#define CLIP_MOSSCHARGER_APPEAR 384
+#define CLIP_MOSSCHARGER_CHARGE 385
+#define CLIP_MOSSCHARGER_DEATH_AIR 386
+#define CLIP_MOSSCHARGER_DEATH_LAND 387
+#define CLIP_MOSSCHARGER_DISAPPEAR 388
+#define CLIP_MOSSCHARGER_ESCAPE 389
+#define CLIP_MOSSCHARGER_GET_UP 390
+#define CLIP_MOSSCHARGER_STUN 391
+#define CLIP_MOSSCHARGER_TURNRUN 392
+#define CLIP_MOSSKNIGHT_DEATH_AIR 393
+#define CLIP_MOSSKNIGHT_DEATH_LAND 394
+#define CLIP_MOSSKNIGHT_DORMANT_1 395
+#define CLIP_MOSSKNIGHT_DORMANT_2 396
+#define CLIP_MOSSKNIGHT_EVADE 397
+#define CLIP_MOSSKNIGHT_IDLE 398
+#define CLIP_MOSSKNIGHT_SHAKE 399
+#define CLIP_MOSSKNIGHT_SHIELD_FRONT 400
+#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 401
+#define CLIP_MOSSKNIGHT_SHIELD_TOP 402
+#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 403
+#define CLIP_MOSSKNIGHT_SHOOT 404
+#define CLIP_MOSSKNIGHT_SHOOT_END 405
+#define CLIP_MOSSKNIGHT_SLASH 406
+#define CLIP_MOSSKNIGHT_SLASH_2 407
+#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 408
+#define CLIP_MOSSKNIGHT_SLASH_EFFECT 409
+#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 410
+#define CLIP_MOSSKNIGHT_SLASH_END 411
+#define CLIP_MOSSKNIGHT_SLASH_QUICK 412
+#define CLIP_MOSSKNIGHT_TURN 413
+#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 414
+#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 415
+#define CLIP_MOSSKNIGHT_WAKE 416
+#define CLIP_MOSSKNIGHT_WALK 417
+#define CLIP_HORNET_A_DASH 418
+#define CLIP_HORNET_A_DASH_ANTIC 419
+#define CLIP_HORNET_AIR_DASH_EFFECT 420
+#define CLIP_HORNET_DEATH_AIR 421
+#define CLIP_HORNET_EVADE 422
+#define CLIP_HORNET_EVADE_ANTIC 423
+#define CLIP_HORNET_FALL 424
+#define CLIP_HORNET_FLASH 425
+#define CLIP_HORNET_FLOURISH 426
+#define CLIP_HORNET_G_DASH 427
+#define CLIP_HORNET_G_DASH_ANTIC 428
+#define CLIP_HORNET_G_DASH_EFFECT 429
+#define CLIP_HORNET_G_DASH_RECOVER1 430
+#define CLIP_HORNET_G_DASH_RECOVER2 431
+#define CLIP_HORNET_HARD_LAND 432
+#define CLIP_HORNET_IDLE 433
+#define CLIP_HORNET_JUMP 434
+#define CLIP_HORNET_JUMP_ANTIC 435
+#define CLIP_HORNET_LAND 436
+#define CLIP_HORNET_NEEDLE 437
+#define CLIP_HORNET_NEEDLE_THREAD 438
+#define CLIP_HORNET_RUN 439
+#define CLIP_HORNET_SPHERE_ANTIC_A 440
+#define CLIP_HORNET_SPHERE_ANTIC_G 441
+#define CLIP_HORNET_SPHERE_ATTACK 442
+#define CLIP_HORNET_SPHERE_BALL 443
+#define CLIP_HORNET_SPHERE_RECOVER_A 444
+#define CLIP_HORNET_SPHERE_RECOVER_G 445
+#define CLIP_HORNET_STUN 446
+#define CLIP_HORNET_STUN_AIR 447
+#define CLIP_HORNET_THROW 448
+#define CLIP_HORNET_THROW_ANTIC 449
+#define CLIP_HORNET_THROW_EFFECT 450
+#define CLIP_HORNET_THROW_RECOVER 451
+#define CLIP_HORNET_WALL_IMPACT 452
+#define CLIP_HORNET_WOUNDED 453
+#define CLIP_BGATE_BG_OPENED 454
+#define CLIP_BGATE_BG_CLOSE_1 455
+#define CLIP_BGATE_BG_CLOSE_2 456
+#define CLIP_BGATE_BG_OPEN 457
+#define CLIP_BGATE_BG_CLOSED 458
+#define CLIP_BGATE_BONE_GATE_OPENED 459
+#define CLIP_BGATE_BONE_GATE_CLOSE 460
+#define CLIP_BGATE_BONE_GATE_CLOSED 461
+#define CLIP_BGATE_BONE_GATE_OPEN 462
+#define CLIP_COCOON_COCOON_IDLE 463
+#define CLIP_COCOON_COCOON_SWEAT 464
+#define CLIP_COCOON_SCUTTLER_LAND 465
+#define CLIP_COCOON_SCUTTLER_RUN 466
+#define CLIP_FX_SPLAT 467
+#define CLIP_FX_SPLAT2 468
+#define CLIP_FIREBALL_BLAST 469
+#define CLIP_FIREBALL_BALL 470
+#define CLIP_FIREBALL_BALL_END 471
+#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 472
+#define CLIP_DRIP_IDLE 473
+#define CLIP_DRIP_DRIP 474
+#define CLIP_DRIP_FALL 475
+#define CLIP_DRIP_IMPACT 476
+#define CLIP_HORNETCS_EVADE 477
+#define CLIP_HORNETCS_EVADE_ANTIC 478
+#define CLIP_HORNETCS_FALL 479
+#define CLIP_HORNETCS_HARPOON_SIDE 480
+#define CLIP_HORNETCS_IDLE 481
+#define CLIP_HORNETCS_JUMP_FULL 482
+#define CLIP_HORNETCS_POINT 483
+#define CLIP_HORNETCS_RUN 484
+#define CLIP_HORNETCS_SOFT_LAND 485
+#define CLIP_HORNETCS_THREAD_1 486
+#define CLIP_HORNETCS_THROW_SIDE 487
+#define CLIP_HORNETCS_THROW_SIDE_START 488
+#define CLIP_HORNETCS_TURN 489
+#define CLIP_HORNETCS_TURNTOIDLE 490
+#define CLIP_BULLET_IDLE 491
+#define CLIP_BULLET_IMPACT 492
+#define CLIP_BULLET_SHOCKWAVE_SPURT 493
+#define CLIP_PROP0_WATERFALL_LOOP 494
+#define CLIP_PROP1_TORCH2 495
+#define CLIP_PROP1_TORCH3 496
+#define CLIP_VM0_FLOWER 497
+#define CLIP_VM0_IDLE 498
+#define CLIP_VM0_REACH 499
+#define CLIP_VM0_REACH_TO_IDLE 500
+#define CLIP_VM0_TALK_LEFT 501
+#define CLIP_VM0_TALK_RIGHT 502
+#define CLIP_VM0_TURN_LEFT 503
+#define CLIP_VM0_TURN_RIGHT 504
+#define CLIP_VM2_IDLE 505
+#define CLIP_VM2_LOOKLEFT 506
+#define CLIP_VM2_LOOKRIGHT 507
+#define CLIP_VM3_IDLE 508
+#define CLIP_VM3_TALK 509
+#define CLIP_VM3_TALK_END 510
+#define CLIP_VM4_IDLE 511
+#define CLIP_VM4_LOOKLEFT 512
+#define CLIP_VM4_LOOKRIGHT 513
+#define CLIP_VM4_SIT 514
+#define CLIP_VM4_SIT_TALK 515
+#define CLIP_VM4_SIT_TALK_END 516
+#define CLIP_VM5_DAZED 517
+#define CLIP_VM5_IDLE 518
+#define CLIP_VM5_TURN_L 519
+#define CLIP_VM5_TURN_R 520
+#define CLIP_VM5_WAKE 521
+#define CLIP_VM8_HEGEMOL_CAST 522
+#define CLIP_VM8_HEGEMOL_IDLE 523
+#define CLIP_VM8_LURIEN_CAST 524
+#define CLIP_VM8_LURIEN_IDLE 525
+#define CLIP_VM8_MONOMON_CAST 526
+#define CLIP_VM8_MONOMON_IDLE 527
+#define CLIP_VM9_IDLE 528
+#define CLIP_VM9_SIT_IDLE 529
+#define CLIP_VM9_SIT_TALK 530
+#define CLIP_VM9_SIT_TALK_END 531
+#define CLIP_VM9_SUMMON 532
+#define CLIP_VM9_TALK 533
+#define CLIP_VM9_TALK_END 534
+#define CLIP_VM9_TURN 535
+#define CLIP_VM11_IDLE 536
+#define CLIP_VM11_LOOK_LEFT 537
+#define CLIP_VM11_LOOK_RIGHT 538
+#define CLIP_VM11_TALK_CONVO_END 539
+#define CLIP_VM11_TALK_CONVO_START 540
+#define CLIP_VM11_TALK_SHOP_END 541
+#define CLIP_VM11_TALK_SHOP_START 542
+#define CLIP_VM12_IDLE 543
+#define CLIP_VM12_SHOP_END 544
+#define CLIP_VM12_SHOP_START 545
+#define CLIP_VM12_TALK_END 546
+#define CLIP_VM12_TALK_START 547
+#define CLIP_VM13_CRY 548
+#define CLIP_VM13_CRY_TURN 549
+#define CLIP_VM13_FREED 550
+#define CLIP_VM13_HOME_BOUNCE 551
+#define CLIP_VM13_HOME_WAVE 552
+#define CLIP_VM13_IDLE 553
+#define CLIP_VM14_BECKON 554
+#define CLIP_VM14_CHEER 555
+#define CLIP_VM14_CRY 556
+#define CLIP_VM14_GIFT 557
+#define CLIP_VM14_IDLE 558
+#define CLIP_ANIM0_DASH_CLOAK_CORPSE000 559
+#define CLIP_ANIM1_GROUND_PLINK_0 560
+#define CLIP_ANIM2_FIREBALL_COLLECT_ANIM 561
+#define SPRITE_HERO_LIGHT 2584
+#define SPRITE_DIALOGUE_BACKBOARD 2585
+#define SPRITE_PROMPT_SHADOW 2586
+#define SPRITE_CORPSE_NAIL 2587
+#define SPRITE_FK_BARREL 2588
+#define SPRITE_FK_STAFF 2589
+#define SPRITE_DIGIT0 2919
#define STYLE_DIALOGUE 0
#define STYLE_PROMPT 1
#define STYLE_TITLE_L 2
@@ -654,7 +672,7 @@
#define EK_MOSSKNIGHT 28
#define EK_HORNET 29
#define NUM_KINDS 30
-#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 177, 176, -1, -1, -1, -1, -1, -1, -1, -1, 179, 180}}, {EF_BUZZER, {182, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 184, 185}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 192, 191, -1, -1, -1, -1, -1, -1, -1, 189, 190}}, {EF_BOUNCER, {-1, -1, -1, 195, -1, -1, -1, -1, -1, -1, -1, 193, 194}}, {EF_SPITTER, {-1, -1, -1, 198, 199, 197, -1, -1, -1, -1, -1, 196, -1}}, {EF_ROLLER, {202, -1, -1, 204, 203, 205, -1, -1, -1, -1, -1, 200, 201}}, {EF_BLOCKER, {212, -1, -1, 208, 213, 206, 207, 214, 215, 211, 210, -1, 209}}, {EF_HUSK, {221, 222, 223, 216, 218, 217, -1, -1, -1, -1, -1, 219, 220}}, {EF_HUSK, {229, 230, 231, 224, 226, 225, -1, -1, -1, -1, -1, 227, 228}}, {EF_HUSK, {237, 238, 239, 232, 234, 233, -1, -1, -1, -1, -1, 235, 236}}, {EF_HUSK, {245, 246, 247, 240, 242, 241, -1, -1, -1, -1, -1, 243, 244}}, {EF_LEAPER, {251, 253, 254, 248, 252, -1, -1, -1, -1, -1, -1, 249, 250}}, {EF_GUARD, {260, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 257, 258}}, {EF_FK, {282, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 280}}, {EF_FKHEAD, {302, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 300}}, {EF_HATCHER, {-1, -1, -1, 307, 306, -1, -1, -1, -1, -1, -1, 304, 305}}, {EF_HATCHLING, {-1, -1, -1, 308, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {314, -1, -1, 312, 313, 316, 315, 309, -1, -1, -1, 310, 311}}, {EF_GFLY, {329, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 338, 339, 337, 333, 334, -1, -1, -1, -1, -1, 335, 336}}, {EF_PIGEON, {-1, -1, -1, 341, 342, 343, 340, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {345, -1, -1, 348, 347, 346, -1, -1, -1, -1, -1, 344, -1}}, {EF_SHAKER, {352, 353, 354, 349, -1, -1, -1, -1, -1, -1, -1, 350, 351}}, {EF_MOSQUITO, {359, -1, -1, 361, 360, 356, 355, -1, -1, -1, -1, 357, 358}}, {EF_FATFLY, {365, -1, -1, 362, -1, -1, -1, -1, -1, -1, -1, 363, 364}}, {EF_MOSSCHARGER, {-1, -1, -1, 366, 367, 370, 373, 372, 374, 371, -1, 368, 369}}, {EF_MOSSKNIGHT, {380, 395, 399, -1, -1, -1, -1, -1, -1, -1, -1, 375, 376}}, {EF_HORNET, {415, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 403, -1}}}
+#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 195, 194, -1, -1, -1, -1, -1, -1, -1, -1, 197, 198}}, {EF_BUZZER, {200, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 202, 203}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 210, 209, -1, -1, -1, -1, -1, -1, -1, 207, 208}}, {EF_BOUNCER, {-1, -1, -1, 213, -1, -1, -1, -1, -1, -1, -1, 211, 212}}, {EF_SPITTER, {-1, -1, -1, 216, 217, 215, -1, -1, -1, -1, -1, 214, -1}}, {EF_ROLLER, {220, -1, -1, 222, 221, 223, -1, -1, -1, -1, -1, 218, 219}}, {EF_BLOCKER, {230, -1, -1, 226, 231, 224, 225, 232, 233, 229, 228, -1, 227}}, {EF_HUSK, {239, 240, 241, 234, 236, 235, -1, -1, -1, -1, -1, 237, 238}}, {EF_HUSK, {247, 248, 249, 242, 244, 243, -1, -1, -1, -1, -1, 245, 246}}, {EF_HUSK, {255, 256, 257, 250, 252, 251, -1, -1, -1, -1, -1, 253, 254}}, {EF_HUSK, {263, 264, 265, 258, 260, 259, -1, -1, -1, -1, -1, 261, 262}}, {EF_LEAPER, {269, 271, 272, 266, 270, -1, -1, -1, -1, -1, -1, 267, 268}}, {EF_GUARD, {278, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 275, 276}}, {EF_FK, {300, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 298}}, {EF_FKHEAD, {320, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 318}}, {EF_HATCHER, {-1, -1, -1, 325, 324, -1, -1, -1, -1, -1, -1, 322, 323}}, {EF_HATCHLING, {-1, -1, -1, 326, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {332, -1, -1, 330, 331, 334, 333, 327, -1, -1, -1, 328, 329}}, {EF_GFLY, {347, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 356, 357, 355, 351, 352, -1, -1, -1, -1, -1, 353, 354}}, {EF_PIGEON, {-1, -1, -1, 359, 360, 361, 358, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {363, -1, -1, 366, 365, 364, -1, -1, -1, -1, -1, 362, -1}}, {EF_SHAKER, {370, 371, 372, 367, -1, -1, -1, -1, -1, -1, -1, 368, 369}}, {EF_MOSQUITO, {377, -1, -1, 379, 378, 374, 373, -1, -1, -1, -1, 375, 376}}, {EF_FATFLY, {383, -1, -1, 380, -1, -1, -1, -1, -1, -1, -1, 381, 382}}, {EF_MOSSCHARGER, {-1, -1, -1, 384, 385, 388, 391, 390, 392, 389, -1, 386, 387}}, {EF_MOSSKNIGHT, {398, 413, 417, -1, -1, -1, -1, -1, -1, -1, -1, 393, 394}}, {EF_HORNET, {433, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 421, -1}}}
#define TXT_PROMPT_LISTEN 68
#define TXT_PROMPT_REST 69
#define TXT_PROMPT_INSPECT 70
@@ -843,63 +861,63 @@
#define TITLE_CHARM_SLUG 19
#define NUM_TITLES 20
#define TITLE_TABLE {{82, 83, -1, -1}, {84, 85, 86, -1}, {87, 88, -1, 89}, {90, 91, -1, 92}, {93, 94, -1, 95}, {96, 97, -1, -1}, {98, 99, 100, -1}, {101, 102, -1, -1}, {103, 104, -1, -1}, {105, 106, -1, -1}, {107, 108, -1, -1}, {109, 110, -1, -1}, {111, 112, -1, -1}, {113, 114, -1, -1}, {115, 116, -1, 117}, {118, 119, -1, 120}, {118, 119, -1, 121}, {122, 123, 124, -1}, {122, 123, -1, -1}, {125, 126, -1, 127}}
-#define SPRITE_FLEUR_TOP 2521
+#define SPRITE_FLEUR_TOP 2590
#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 2522
+#define SPRITE_FLEUR_BOT 2591
#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 SPRITE_MSG_BG 2523
-#define SPRITE_MSG_STOP 2524
-#define SPRITE_MSG_FLEUR 2525
-#define SPRITE_MSG_KEY 2526
-#define SPRITE_MSG_ICON_FIREBALL 2527
-#define SPRITE_MSG_ICON_DASH 2528
-#define SPRITE_GRASS_BALL 2529
+#define SPRITE_MSG_BG 2592
+#define SPRITE_MSG_STOP 2593
+#define SPRITE_MSG_FLEUR 2594
+#define SPRITE_MSG_KEY 2595
+#define SPRITE_MSG_ICON_FIREBALL 2596
+#define SPRITE_MSG_ICON_DASH 2597
+#define SPRITE_GRASS_BALL 2598
#define MSG_TABLE {{128, 129, 130, 131, 132, 133}, {134, 135, 136, 137, 138, 139}}
-#define NOTICE_BACKBOARD {2530, 1.0000f, 0.6931f}
-#define TUTE_FLEUR {2525, 1.0000f, 1.0000f}
-#define TUTE_BACKBOARD {2531, 1.0000f, 0.9560f}
-#define TUTE_IMAGE {2532, 1.0000f, 1.0000f}
-#define TUTE_STOP {2524, 1.0000f, 1.0000f}
-#define NOTICE_ICONS {2533, 2534, 2535}
+#define NOTICE_BACKBOARD {2599, 1.0000f, 0.6931f}
+#define TUTE_FLEUR {2594, 1.0000f, 1.0000f}
+#define TUTE_BACKBOARD {2600, 1.0000f, 0.9560f}
+#define TUTE_IMAGE {2601, 1.0000f, 1.0000f}
+#define TUTE_STOP {2593, 1.0000f, 1.0000f}
+#define NOTICE_ICONS {2602, 2603, 2604}
#define CHARM_ICON_K 1.5000f
-#define CHARM_ICONS {-1, 2536, 2537, 2538, 2539, -1, 2540, 2541, 2542, -1, -1, -1, -1, -1, 2543, -1, -1, -1, 2544, 2545, 2546, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CHARM_ICONS {-1, 2605, 2606, 2607, 2608, -1, 2609, 2610, 2611, -1, -1, -1, -1, -1, 2612, -1, -1, -1, 2613, 2614, 2615, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
#define CHARM_NAMES {-1, 140, 141, 142, 143, -1, 144, 145, 146, -1, -1, -1, -1, -1, 147, -1, -1, -1, 148, 149, 150, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
#define TXT_CHARM_TUTE_TITLE 151
#define TXT_CHARM_TUTE_SUB 152
#define TXT_CHARM_REMINDER 153
-#define MENU_LOGO {2547, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_LOGO {2616, 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 {2548, 0.0000f, 0.0000f, 1.0023f, 1.0000f}
+#define MENU_POINTER {2617, 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 {2549, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
+#define MENU_PROFILES_FLEUR {2618, 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, {2550, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2551, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2552, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2553, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2554, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
+#define MENU_SLOT_ZONES {{2, {2619, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2620, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2621, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2622, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2623, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
#define MENU_SLOT_NZONES 5
#define MENU_SLOT_BG_DY 0.0102f
-#define MENU_SLOT_FLEUR {2555, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_FLEUR {2624, 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 {2556, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_SELECTOR {2625, 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 {2557, 0.0000f, 0.0000f, 1.0000f, 1.0025f}
+#define MENU_SLOT_CURSOR {2626, 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 {2558, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_ORB {2627, 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 {2559, 0.0000f, 0.0000f, 1.0039f, 1.0000f}
+#define MENU_SLOT_GEO {2628, 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 {2560, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_HEALTH {2629, 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
@@ -917,9 +935,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 {2561, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_TOP {2630, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_PAUSE_TOP_Y 2.3653f
-#define MENU_PAUSE_BOT {2562, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_BOT {2631, 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
@@ -938,39 +956,39 @@
#define TXT_ZONES {166, 167, 168, 169, 170}
#define INV_X -4.0500f
#define INV_Y 7.5500f
-#define INV_BORDER {{2563, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2563, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2564, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2565, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2566, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2567, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
+#define INV_BORDER {{2632, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2632, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2633, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2634, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2635, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2636, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
#define INV_NBORDER 6
-#define INV_FRAME {2568, 4.0479f, -7.1963f, 1.0f, 1.0f}
-#define INV_ARROW_L {2569, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
-#define INV_ARROW_R {2569, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_L {2570, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_R {2570, 18.0400f, -0.4300f, 1.0000f, 1.0000f}
+#define INV_FRAME {2637, 4.0479f, -7.1963f, 1.0f, 1.0f}
+#define INV_ARROW_L {2638, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
+#define INV_ARROW_R {2638, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_L {2639, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_R {2639, 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 {173, 174, 175, 176}
-#define CH_BB {2571, -7.9200f, -8.3700f, 1.0000f, 1.0000f}
+#define CH_BB {2640, -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 {2572, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
+#define CH_GLOW {2641, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
#define CH_GLOW_A 0.6970f
-#define CH_ICONS {-1, 2536, 2537, 2538, 2539, -1, 2540, 2541, 2542, -1, -1, -1, -1, -1, 2543, -1, -1, -1, 2544, 2545, 2546, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define CH_NEXT_DOT {2573, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_ICONS {-1, 2605, 2606, 2607, 2608, -1, 2609, 2610, 2611, -1, -1, -1, -1, -1, 2612, -1, -1, -1, 2613, 2614, 2615, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CH_NEXT_DOT {2642, 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 {2574, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
-#define CH_NOTCH_EMPTY {2575, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_FULL {2643, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_EMPTY {2644, 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 {2576, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
+#define CH_DIVIDER {2645, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}
-#define CH_COST_PIP {2574, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_COST_PIP {2643, 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
@@ -979,9 +997,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 {2577, 16.3208f, -13.2878f, 1.0f, 1.0f}
+#define CH_CONFIRM_KEY {2646, 16.3208f, -13.2878f, 1.0f, 1.0f}
#define CH_CONFIRM_KEY_W 0.6412f
-#define CH_CURSOR {2578, 0.0000f, 0.0000f, 1.0000f, 0.9756f}
+#define CH_CURSOR {2647, 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 177
@@ -995,23 +1013,23 @@
#define TXT_CHARM_NAMES_INV {-1, 185, 186, 187, 188, -1, 189, 190, 191, -1, -1, -1, -1, -1, 192, -1, -1, -1, 193, 194, 195, -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, 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_KEY_OK 207
-#define INV_FIXED {{2579, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2580, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2581, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2582, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2583, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2584, -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}, {2585, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2586, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}
+#define INV_FIXED {{2648, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2649, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2650, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2651, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2652, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2653, -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}, {2654, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2655, -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 {{2587, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2588, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2589, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2590, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
-#define INV_VESSEL_PIECES {{2591, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2592, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2593, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}
+#define INV_HEART_PIECES {{2656, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2657, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2658, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2659, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
+#define INV_VESSEL_PIECES {{2660, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2661, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2662, -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 {{2594, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2595, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2596, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2597, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2598, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2599, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}
+#define INV_EQ {{2663, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2664, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2665, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2666, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2667, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2668, 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 {{2600, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2601, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2602, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2603, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}
+#define INV_TRINKETS {{2669, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2670, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2671, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2672, 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 {2604, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
-#define INV_DIVIDERS {{2605, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2605, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}
+#define INV_TRINKET_BB {2673, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
+#define INV_DIVIDERS {{2674, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2674, 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 {{208, 209}, {210, 211}, {212, 213}, {210, 214}, {210, 215}, {216, 217}}
@@ -1020,15 +1038,15 @@
#define TXT_INV_EQ {{233, 234}, {235, 236}, {237, 238}, {239, 240}, {241, 242}, {243, 244}}
#define TXT_INV_QUILL {245, 246, 247, 248}
#define TXT_INV_TRINKETS {{249, 250}, {251, 252}, {253, 254}, {255, 256}}
-#define SHOP_BACKBOARD {2606, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
-#define SHOP_MASK_TOP {2607, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
-#define SHOP_MASK_BOTTOM {2608, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
-#define SHOP_ARROW_U {2609, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
-#define SHOP_ARROW_D {2609, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
-#define SHOP_SELECTOR {2610, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
-#define SHOP_CONFIRM_GEO {2611, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
-#define SHOP_POINTER_L {2612, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
-#define SHOP_POINTER_R {2612, 6.6249f, -2.0798f, -1.0000f, 1.0000f}
+#define SHOP_BACKBOARD {2675, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
+#define SHOP_MASK_TOP {2676, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
+#define SHOP_MASK_BOTTOM {2677, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
+#define SHOP_ARROW_U {2678, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
+#define SHOP_ARROW_D {2678, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
+#define SHOP_SELECTOR {2679, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
+#define SHOP_CONFIRM_GEO {2680, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_L {2681, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_R {2681, 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, 29, 81, 134, 182, 206, 226, 223, 0, 0, 0, 0, 0, 0}
#define SHOP_CONFIRM_ITEM {5.0900f, 2.4700f}
#define TXT_KEY_BACK 258
@@ -1048,7 +1066,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 {2613, 5.5100f, 2.5800f, 1.0000f, 1.0000f}
+#define SHOP_PEG {2682, 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}
@@ -1069,9 +1087,9 @@
#define TXT_SHOP_YES 268
#define TXT_SHOP_NO 269
#define SHOP_DESC_BOTTOM -5.0500f
-#define SHOP_ITEMS {{2615, 0.5714f, 270, 271, 150, 1, 125, -1, 0, 0}, {2615, 0.5714f, 270, 272, 500, 1, 126, 125, 0, 0}, {2616, 0.5714f, 273, 274, 550, 3, 127, -1, 0, 0}, {2617, 0.5714f, 275, 276, 950, 10, 128, -1, 0, 0}, {2618, 0.5714f, 277, 278, 300, 2, 37, -1, 0, 1}, {2619, 0.5714f, 279, 280, 200, 2, 40, -1, 0, 4}, {2620, 0.5714f, 281, 282, 1800, 0, 119, -1, 0, 0}, {2621, 0.5714f, 283, 284, 60, 11, 129, -1, 0, 0}, {2622, 0.5714f, 285, 286, 220, 2, 38, -1, 0, 2}, {2623, 0.5714f, 287, 288, 120, 0, 2, -1, 0, 0}, {2624, 0.5714f, 289, 290, 40, 9, 130, 10, 0, 0}, {2624, 0.5714f, 291, 292, 80, 9, 131, 28, 0, 0}, {2625, 0.5714f, 293, 294, 100, 16, 133, -1, 0, 0}, {2626, 0.5714f, 295, 296, 100, 16, 134, -1, 0, 0}, {2627, 0.5714f, 297, 298, 100, 16, 135, -1, 0, 0}, {2628, 0.5714f, 299, 300, 100, 16, 137, 147, 0, 0}, {2629, 0.5714f, 301, 302, 100, 16, 136, -1, 0, 0}, {2630, 0.5714f, 303, 304, 100, 17, 139, -1, 0, 0}, {2631, 0.5714f, 305, 306, 100, 17, 140, -1, 0, 0}, {2632, 0.5714f, 307, 308, 100, 17, 141, 14, 0, 0}, {2633, 0.5714f, 309, 310, 210, 17, 142, 14, 0, 0}, {2634, 0.5714f, 311, 312, 250, 2, 44, -1, 0, 8}, {2635, 0.5714f, 313, 314, 300, 2, 54, -1, 0, 18}, {2636, 0.5714f, 315, 316, 120, 2, 50, -1, 0, 14}, {2637, 0.5714f, 317, 318, 220, 2, 55, -1, 0, 19}, {2638, 0.5714f, 319, 320, 800, 2, 43, -1, 0, 7}, {2639, 0.5714f, 321, 322, 120, 8, 143, -1, 5, 0}, {2639, 0.5714f, 321, 322, 500, 8, 144, -1, 10, 0}, {2639, 0.5714f, 321, 322, 900, 8, 145, -1, 18, 0}, {2639, 0.5714f, 321, 323, 1400, 8, 146, -1, 25, 0}}
+#define SHOP_ITEMS {{2684, 0.5714f, 270, 271, 150, 1, 125, -1, 0, 0}, {2684, 0.5714f, 270, 272, 500, 1, 126, 125, 0, 0}, {2685, 0.5714f, 273, 274, 550, 3, 127, -1, 0, 0}, {2686, 0.5714f, 275, 276, 950, 10, 128, -1, 0, 0}, {2687, 0.5714f, 277, 278, 300, 2, 37, -1, 0, 1}, {2688, 0.5714f, 279, 280, 200, 2, 40, -1, 0, 4}, {2689, 0.5714f, 281, 282, 1800, 0, 119, -1, 0, 0}, {2690, 0.5714f, 283, 284, 60, 11, 129, -1, 0, 0}, {2691, 0.5714f, 285, 286, 220, 2, 38, -1, 0, 2}, {2692, 0.5714f, 287, 288, 120, 0, 2, -1, 0, 0}, {2693, 0.5714f, 289, 290, 40, 9, 130, 10, 0, 0}, {2693, 0.5714f, 291, 292, 80, 9, 131, 28, 0, 0}, {2694, 0.5714f, 293, 294, 100, 16, 133, -1, 0, 0}, {2695, 0.5714f, 295, 296, 100, 16, 134, -1, 0, 0}, {2696, 0.5714f, 297, 298, 100, 16, 135, -1, 0, 0}, {2697, 0.5714f, 299, 300, 100, 16, 137, 147, 0, 0}, {2698, 0.5714f, 301, 302, 100, 16, 136, -1, 0, 0}, {2699, 0.5714f, 303, 304, 100, 17, 139, -1, 0, 0}, {2700, 0.5714f, 305, 306, 100, 17, 140, -1, 0, 0}, {2701, 0.5714f, 307, 308, 100, 17, 141, 14, 0, 0}, {2702, 0.5714f, 309, 310, 210, 17, 142, 14, 0, 0}, {2703, 0.5714f, 311, 312, 250, 2, 44, -1, 0, 8}, {2704, 0.5714f, 313, 314, 300, 2, 54, -1, 0, 18}, {2705, 0.5714f, 315, 316, 120, 2, 50, -1, 0, 14}, {2706, 0.5714f, 317, 318, 220, 2, 55, -1, 0, 19}, {2707, 0.5714f, 319, 320, 800, 2, 43, -1, 0, 7}, {2708, 0.5714f, 321, 322, 120, 8, 143, -1, 5, 0}, {2708, 0.5714f, 321, 322, 500, 8, 144, -1, 10, 0}, {2708, 0.5714f, 321, 322, 900, 8, 145, -1, 18, 0}, {2708, 0.5714f, 321, 323, 1400, 8, 146, -1, 25, 0}}
#define SHOP_FIRST {0, 8, 21, 30}
-#define SHOP_ROW_GEO {2614, 1.4551f, 0.0000f, 1.0000f, 1.0000f}
+#define SHOP_ROW_GEO {2683, 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}
@@ -1079,6 +1097,11 @@
#define SHOP_NOSTOCK {325, 326, 327}
#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}
+#define COLLECT_MOVER {0.1248f, -0.8983f, -0.2000f, 3.4800f}
+#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 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/game.c b/games/hollowknight/src/game.c
index c5823da9..a59d2cc8 100644
--- a/games/hollowknight/src/game.c
+++ b/games/hollowknight/src/game.c
@@ -29,6 +29,7 @@ void game_new(void) {
prompts_reset();
inv_reset();
shop_reset();
+ collect_reset();
death_reset();
white_blanker_reset();
}
@@ -309,6 +310,7 @@ static void step(uint32_t keys) {
benches_tick();
vm_tick();
msg_tick();
+ collect_tick();
titles_tick();
prompts_tick();
dialogue_tick();
@@ -335,6 +337,7 @@ void game_tick(uint32_t keys) {
bool game_changing_room(void) { return g_game.scene_phase != SP_NONE; }
void game_draw_layers(void) {
+ collect_draw();
hud_draw();
msg_draw();
titles_draw();
diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.h
index 6cebf5f7..af7b43c6 100644
--- a/games/hollowknight/src/game.h
+++ b/games/hollowknight/src/game.h
@@ -402,6 +402,12 @@ void ui_piece(const UiPiece *p, float ox, float oy, float k, uint8_t tint);
void ui_sprite_at(int sprite, float x, float y, float k, uint8_t tint);
void ui_text_at(int text, int style, const UiText *t, float ox, float oy, int align, float a); /* (0 left, 1 center, 2 right) */
void ui_number_at(int v, int style, float x, float top, int align, float a);
+/* a mask shard's, a vessel fragment's getting and its UI (collect.c) */
+void collect_reset(void);
+void collect_start(int kind); /* 0 a mask shard, 1 a vessel fragment */
+void collect_tick(void);
+void collect_draw(void); /* (before the HUD: behind it) */
+bool collect_active(void);
/* the shops' menu (shop.c): SHOP UP from its region's script; what it does the game goes on behind it */
void shop_reset(void);
void shop_event(int ev);
diff --git a/games/hollowknight/src/shop.c b/games/hollowknight/src/shop.c
index 824500cb..3180f77f 100644
--- a/games/hollowknight/src/shop.c
+++ b/games/hollowknight/src/shop.c
@@ -157,15 +157,10 @@ static void pay(const Item *it) {
static bool give(const Item *it) {
switch (it->type) {
case ST_HEART:
- /* (Heart Piece: a piece of a mask; four, a mask more) */
- pd_set_flag(PDF_HEART_PIECE_COLLECTED, true);
- if (++g_pd.heart_pieces >= 4) g_pd.heart_pieces = 0, g_pd.max_health++, hero_max_health();
- return false;
case ST_VESSEL:
- /* (Vessel Fragment: three, a soul vessel more) */
- pd_set_flag(PDF_VESSEL_FRAGMENT_COLLECTED, true);
- if (++g_pd.vessel_fragments >= 3) g_pd.vessel_fragments = 0, g_pd.mp_reserve_max = (int16_t)(g_pd.mp_reserve_max + 33);
- return false;
+ /* (Heart Piece, Vessel Fragment: its Instant made, the window closed) */
+ collect_start(it->type == ST_VESSEL);
+ return true;
case ST_CHARM:
/* (Charm: one more; the first, the charms' lesson) */
g_pd.charms_owned++;
diff --git a/games/hollowknight/tests/play.c b/games/hollowknight/tests/play.c
index 3fbb1495..61507cd2 100644
--- a/games/hollowknight/tests/play.c
+++ b/games/hollowknight/tests/play.c
@@ -57,6 +57,11 @@ int main(int argc, char **argv) {
if (getenv("HKMP")) g_pd.mp = (int16_t)atoi(getenv("HKMP"));
if (getenv("HKHEALTH")) g_pd.health = (int8_t)atoi(getenv("HKHEALTH"));
if (getenv("HKGRUBS")) g_pd.grubs_collected = (uint8_t)atoi(getenv("HKGRUBS"));
+ if (getenv("HKPIECES")) {
+ int hp = 0, vf = 0;
+ sscanf(getenv("HKPIECES"), "%d,%d", &hp, &vf);
+ g_pd.heart_pieces = (uint8_t)hp, g_pd.vessel_fragments = (uint8_t)vf;
+ }
if (getenv("HKGEO")) g_pd.geo = atoi(getenv("HKGEO"));
if (getenv("HKFIRE")) g_pd.fireball_level = atoi(getenv("HKFIRE"));
if (getenv("HKHORNETGP")) g_pd.hornet_greenpath = (uint8_t)atoi(getenv("HKHORNETGP"));
@@ -179,9 +184,11 @@ int main(int argc, char **argv) {
if (pd_flag(i)) printf(" %d", i);
int np = 0;
for (int i = 0; i < MAX_PERSIST; i++) np += persist_get(i);
- printf(" hornet_greenpath %d trinkets %d %d %d %d charms %d saved %d health %d+%d mp %d geo %d grubs %d\n", g_pd.hornet_greenpath,
+ printf(" hornet_greenpath %d trinkets %d %d %d %d charms %d saved %d health %d+%d mp %d geo %d grubs %d"
+ " max %d pieces %d %d reserve %d\n", g_pd.hornet_greenpath,
g_pd.trinkets[0], g_pd.trinkets[1], g_pd.trinkets[2], g_pd.trinkets[3], g_pd.charms_owned, np, g_pd.health,
- g_pd.health_blue, g_pd.mp, (int)g_pd.geo, g_pd.grubs_collected);
+ g_pd.health_blue, g_pd.mp, (int)g_pd.geo, g_pd.grubs_collected, g_pd.max_health, g_pd.heart_pieces,
+ g_pd.vessel_fragments, g_pd.mp_reserve_max);
}
return 0;
}
diff --git a/games/hollowknight/tools/actors.py b/games/hollowknight/tools/actors.py
index 1b2ed5d9..38d6492d 100644
--- a/games/hollowknight/tools/actors.py
+++ b/games/hollowknight/tools/actors.py
@@ -142,6 +142,10 @@ ACTORS = {"knight": KNIGHT,
"Shop_Figurehead_Sly Down", "Shop_Figurehead_Mapperwife Up",
"Shop_Figurehead_Mapperwife Down", "Shop_Figurehead_Slug Up",
"Shop_Figurehead_Slug Down"]),
+ # a mask shard's and a vessel fragment's UI (Heart Container UI, Vessel Fragment UI: in front of the room)
+ "heartui": ("sharedassets10.assets", 592, ["Fleur Appear", "Fleur Disappear", "Get 0", "Get 1", "Get 2", "Get 3",
+ "Get 4", "Got 1", "Got 2", "Got 3", "Fuse", "Head Move"]),
+ "vesselui": ("sharedassets10.assets", 542, ["Get 0", "Get 1", "Get 2", "Get 3", "Got 1", "Got 2"]),
# (Gathering Swarm: the bug that brings geo, a child of each)
"geobug": ("resources.assets", 22564, ["Lamp_Bug_idle"]),
# the dialogue box (on the HUD, a third bigger with its text) and the prompt markers
@@ -152,7 +156,7 @@ ACTORS = {"knight": KNIGHT,
"shade": ("resources.assets", 22801, ["Idle", "Startle", "Fly", "TurnToFly", "TurnToIdle", "Slash Antic", "Slash",
"Slash CD", "Slash Effect", "Cast Antic", "Cast Charge", "Cast",
"Retreat Start", "Retreat End", "Death Start", "Death", "Depart",
- "Appear", "Fireball", "Fireball End", "Cast Ring"])}
+ "Appear", "Fireball", "Fireball End", "Cast Ring", "Death Glow"])}
ACTORS.update(_enemy_actors())
# battle gates (BG Control: the plain ones and the bone ones)
ACTORS["bgate"] = ("sharedassets9.assets", 197, ["BG Opened", "BG Close 1", "BG Close 2", "BG Open", "BG Closed",
@@ -222,7 +226,8 @@ DRAWN_SCALE = {"Arrow Up": 1.3, "Arrow Down": 1.3, "Stop Up": 1.3, "Stop Down":
"SlashEffect F": 1.645, "SlashEffectAlt F": 1.422, "UpSlashEffect F": 1.4, "DownSlashEffect F": 1.28,
"Blast": 1.4, "Ball": 1.45, "Ball End": 1.45, "Fireball Wall Impact": 2.0,
"Lamp_Bug_idle": 1.5 * 1.4838, "Shop_Menu_Top Up": 1.124, "Shop_Menu_Top Down": 1.124,
- "Shop_Menu_Bottom Up": 1.134, "Shop_Menu_Bottom Down": 1.134, "Small Idle": 1.5, "Small Air": 1.5, "Med Idle": 1.5, "Med Air": 1.5, "Large Idle": 1.5, "Large Air": 1.5}
+ "Shop_Menu_Bottom Up": 1.134, "Shop_Menu_Bottom Down": 1.134, "Small Idle": 1.5, "Small Air": 1.5, "Med Idle": 1.5, "Med Air": 1.5, "Large Idle": 1.5, "Large Air": 1.5,
+ "Head Move": 2.0, "Death Glow": 2.0}
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
diff --git a/games/hollowknight/tools/collect.py b/games/hollowknight/tools/collect.py
new file mode 100644
index 00000000..d9b40df8
--- /dev/null
+++ b/games/hollowknight/tools/collect.py
@@ -0,0 +1,28 @@
+"""A mask shard's and a vessel fragment's UI (Heart Container UI, Vessel Fragment UI): where their pieces are, about the
+camera (they follow it, in front of the room): COLLECT_* defines for data.h."""
+import math
+import unity
+
+UIS = (("sharedassets10.assets", 249), ("sharedassets10.assets", 219)) # heart, vessel
+
+
+def build():
+ U = lambda v: "%.4ff" % v
+ out = {}
+
+ def at(o):
+ """{x, y, z, scale} from the UI's root"""
+ return "{%s, %s, %s, %s}" % (U(o["pos"][0]), U(o["pos"][1]), U(o["pos"][2]), U(math.hypot(o["m3"][0], o["m3"][3])))
+
+ pieces = []
+ for path, pid in UIS:
+ p = unity.prefab(path, pid)
+ root = p["objects"][0]["pos"]
+ by = {o["name"]: dict(o, pos=[o["pos"][i] - root[i] for i in range(3)]) for o in p["objects"]}
+ pieces.append(at(by["Piece"]))
+ if pid == UIS[0][1]:
+ out["COLLECT_FLEUR"], out["COLLECT_MOVER"], out["COLLECT_GLOW"] = at(by["Fleur"]), at(by["Mover"]), at(by["Get Glow"])
+ out["COLLECT_PIECE"] = "{%s}" % ", ".join(pieces)
+ # (Tween Mover: the mover and the piece to the new mask's place, the mover to its scale, 1)
+ out["COLLECT_MOVER_TO"] = "{%s, %s}" % (U(-7.7), U(6.04))
+ return out
diff --git a/games/hollowknight/tools/pack.py b/games/hollowknight/tools/pack.py
index bb9fbe7f..0ead3233 100644
--- a/games/hollowknight/tools/pack.py
+++ b/games/hollowknight/tools/pack.py
@@ -521,10 +521,11 @@ def main():
for key, style in (("CHARM_TUTE_TITLE", "TUTE_TITLE"), ("CHARM_TUTE_SUB", "TUTE"), ("CHARM_REMINDER", "TUTE")):
fleurs["TXT_" + key] = TEXTS.add(text.clean(text.sheets()["Prompts"][key]), style)
# the title screen, the save profiles, the pause menu; each room's map zone (the save slots' area)
- import menu, inv, shop
+ import menu, inv, shop, collect
fleurs.update(menu.build(SPRITES, TEXTS))
fleurs.update(inv.build(SPRITES, TEXTS, hud_res, vm.CHARMS, charm_icon))
fleurs.update(shop.build(SPRITES, TEXTS, hud_res, actors.clip_id, vm.CHARMS))
+ fleurs.update(collect.build())
fleurs["ROOM_ZONES"] = "{%s}" % ", ".join(str(scene.settings(unity.scene(r)).get("map_zone") or 0) for r in ROOMS)
for i, item in enumerate(text.MSGS):
fleurs["MSG_" + item] = i