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: the Mothwing Cloak (its fall, the shiny item, inspecting it, the Dash message)

Mason Chen9e43351ff54b
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.bin
index 6e18bb7a..ab2458af 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 bd9d8104..bf09967d 100644
--- a/games/hollowknight/src/data.h
+++ b/games/hollowknight/src/data.h
@@ -185,357 +185,364 @@
#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 125
#define CLIP_PROMPT_BLANK 126
#define CLIP_PROMPT_DOWN 127
-#define CLIP_PROMPT_IDLE 128
-#define CLIP_PROMPT_LISTEN_DOWN 129
-#define CLIP_PROMPT_LISTEN_IDLE 130
-#define CLIP_PROMPT_LISTEN_UP 131
-#define CLIP_PROMPT_UP 132
-#define CLIP_SHADE_APPEAR 133
-#define CLIP_SHADE_CAST 134
-#define CLIP_SHADE_CAST_ANTIC 135
-#define CLIP_SHADE_CAST_CHARGE 136
-#define CLIP_SHADE_CAST_RING 137
-#define CLIP_SHADE_DEATH 138
-#define CLIP_SHADE_DEATH_GLOW 139
-#define CLIP_SHADE_DEATH_START 140
-#define CLIP_SHADE_DEPART 141
-#define CLIP_SHADE_FIREBALL 142
-#define CLIP_SHADE_FIREBALL_END 143
-#define CLIP_SHADE_FLY 144
-#define CLIP_SHADE_IDLE 145
-#define CLIP_SHADE_RETREAT_END 146
-#define CLIP_SHADE_RETREAT_START 147
-#define CLIP_SHADE_SLASH 148
-#define CLIP_SHADE_SLASH_ANTIC 149
-#define CLIP_SHADE_SLASH_CD 150
-#define CLIP_SHADE_SLASH_EFFECT 151
-#define CLIP_SHADE_STARTLE 152
-#define CLIP_SHADE_TURNTOFLY 153
-#define CLIP_SHADE_TURNTOIDLE 154
-#define CLIP_CRAWLER_WALK 155
-#define CLIP_CRAWLER_TURN 156
-#define CLIP_CRAWLER_IDLE 157
-#define CLIP_CRAWLER_DEATH_AIR 158
-#define CLIP_CRAWLER_DEATH_LAND 159
-#define CLIP_BUZZER_CHASE 160
-#define CLIP_BUZZER_IDLE 161
-#define CLIP_BUZZER_STARTLE 162
-#define CLIP_BUZZER_DEATH_AIR 163
-#define CLIP_BUZZER_DEATH_LAND 164
-#define CLIP_BUZZER_FLY 165
-#define CLIP_BUZZER_TURNTOFLY 166
-#define CLIP_BUZZER_TURNTOIDLE 167
-#define CLIP_TIKTIK_DEATH_AIR 168
-#define CLIP_TIKTIK_DEATH_LAND 169
-#define CLIP_TIKTIK_STUN 170
-#define CLIP_TIKTIK_WALK 171
-#define CLIP_GRUZZER_DEATH_AIR 172
-#define CLIP_GRUZZER_DEATH_LAND 173
-#define CLIP_GRUZZER_FLY 174
-#define CLIP_ASPID_DEATH_AIR 175
-#define CLIP_ASPID_FIRE_LONG 176
-#define CLIP_ASPID_FLY 177
-#define CLIP_ASPID_TURNTOFLY 178
-#define CLIP_BALDUR_DEATH_AIR 179
-#define CLIP_BALDUR_DEATH_LAND 180
-#define CLIP_BALDUR_IDLE 181
-#define CLIP_BALDUR_ROLL 182
-#define CLIP_BALDUR_START 183
-#define CLIP_BALDUR_STOP 184
-#define CLIP_ELDERBALDUR_CLOSE1 185
-#define CLIP_ELDERBALDUR_CLOSE2 186
-#define CLIP_ELDERBALDUR_CLOSED 187
-#define CLIP_ELDERBALDUR_DEATH 188
-#define CLIP_ELDERBALDUR_DEATH_STUN 189
-#define CLIP_ELDERBALDUR_HIT 190
-#define CLIP_ELDERBALDUR_IDLE 191
-#define CLIP_ELDERBALDUR_OPEN 192
-#define CLIP_ELDERBALDUR_SHOOT_ANTIC 193
-#define CLIP_ELDERBALDUR_SHOOT_CD 194
-#define CLIP_HUSK_ATTACK_ANTICIPATE 195
-#define CLIP_HUSK_ATTACK_COOLDOWN 196
-#define CLIP_HUSK_ATTACK_LUNGE 197
-#define CLIP_HUSK_DEATH_AIR 198
-#define CLIP_HUSK_DEATH_LAND 199
-#define CLIP_HUSK_IDLE 200
-#define CLIP_HUSK_TURN 201
-#define CLIP_HUSK_WALK 202
-#define CLIP_BARGER_ATTACK_ANTICIPATE 203
-#define CLIP_BARGER_ATTACK_COOLDOWN 204
-#define CLIP_BARGER_ATTACK_LUNGE 205
-#define CLIP_BARGER_DEATH_AIR 206
-#define CLIP_BARGER_DEATH_LAND 207
-#define CLIP_BARGER_IDLE 208
-#define CLIP_BARGER_TURN 209
-#define CLIP_BARGER_WALK 210
-#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 211
-#define CLIP_HORNHEAD_ATTACK_COOLDOWN 212
-#define CLIP_HORNHEAD_ATTACK_LUNGE 213
-#define CLIP_HORNHEAD_DEATH_AIR 214
-#define CLIP_HORNHEAD_DEATH_LAND 215
-#define CLIP_HORNHEAD_IDLE 216
-#define CLIP_HORNHEAD_TURN 217
-#define CLIP_HORNHEAD_WALK 218
-#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 219
-#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 220
-#define CLIP_MOSSRUNNER_ATTACK_LUNGE 221
-#define CLIP_MOSSRUNNER_DEATH_AIR 222
-#define CLIP_MOSSRUNNER_DEATH_LAND 223
-#define CLIP_MOSSRUNNER_IDLE 224
-#define CLIP_MOSSRUNNER_TURN 225
-#define CLIP_MOSSRUNNER_WALK 226
-#define CLIP_LEAPER_ATTACK 227
-#define CLIP_LEAPER_DEATH_AIR 228
-#define CLIP_LEAPER_DEATH_LAND 229
-#define CLIP_LEAPER_IDLE 230
-#define CLIP_LEAPER_LAND 231
-#define CLIP_LEAPER_TURN 232
-#define CLIP_LEAPER_WALK 233
-#define CLIP_GUARD_ANTICIPATE 234
-#define CLIP_GUARD_ATTACK2 235
-#define CLIP_GUARD_DEATH_AIR 236
-#define CLIP_GUARD_DEATH_LAND 237
-#define CLIP_GUARD_DORMANT 238
-#define CLIP_GUARD_IDLE 239
-#define CLIP_GUARD_RUN 240
-#define CLIP_GUARD_STARTLE 241
-#define CLIP_GUARD_STOMP_ANTIC 242
-#define CLIP_GUARD_STOMP_JUMP 243
-#define CLIP_GUARD_STOMP_LAND 244
-#define CLIP_GUARD_STOP_RUN 245
-#define CLIP_GUARD_STOP_WALK 246
-#define CLIP_GUARD_SWIPE 247
-#define CLIP_GUARD_TURN 248
-#define CLIP_GUARD_WAKE 249
-#define CLIP_GUARD_WALK 250
-#define CLIP_FK_ATTACK 251
-#define CLIP_FK_ATTACK_ANTIC 252
-#define CLIP_FK_ATTACK_RECOVER 253
-#define CLIP_FK_BLANK 254
-#define CLIP_FK_BODY 255
-#define CLIP_FK_DEATH_FALL 256
-#define CLIP_FK_DEATH_HEAD_1 257
-#define CLIP_FK_DEATH_HEAD_2 258
-#define CLIP_FK_DEATH_LAND 259
-#define CLIP_FK_DEATH_SPAZ 260
-#define CLIP_FK_IDLE 261
-#define CLIP_FK_JUMP 262
-#define CLIP_FK_JUMP_ANTIC 263
-#define CLIP_FK_JUMP_ATTACK_HIT_1 264
-#define CLIP_FK_JUMP_ATTACK_HIT_2 265
-#define CLIP_FK_JUMP_ATTACK_HIT_3 266
-#define CLIP_FK_JUMP_ATTACK_UP 267
-#define CLIP_FK_LAND 268
-#define CLIP_FK_RAGE 269
-#define CLIP_FK_RUN 270
-#define CLIP_FK_RUN_ANTIC 271
-#define CLIP_FK_STUN_HIT 272
-#define CLIP_FK_STUN_OPEN 273
-#define CLIP_FK_STUN_OPENED 274
-#define CLIP_FK_STUN_RECOVER 275
-#define CLIP_FK_STUN_ROLL 276
-#define CLIP_FK_STUN_ROLL_END 277
-#define CLIP_FK_TURN 278
-#define CLIP_FKHEAD_DEATH_LAND 279
-#define CLIP_FKHEAD_HEAD_HIT 280
-#define CLIP_FKHEAD_HEAD_IDLE 281
-#define CLIP_FKHEAD_HEAD_SPAZ 282
-#define CLIP_HATCHER_DEATH_AIR 283
-#define CLIP_HATCHER_DEATH_LAND 284
-#define CLIP_HATCHER_FIRE 285
-#define CLIP_HATCHER_FLY 286
-#define CLIP_HATCHLING_FLY 287
-#define CLIP_SLUG_BOUNCE 288
-#define CLIP_SLUG_DEATH_AIR 289
-#define CLIP_SLUG_DEATH_LAND 290
-#define CLIP_SLUG_IDLE_TODOWN 291
-#define CLIP_SLUG_IDLE_TOUP 292
-#define CLIP_SLUG_IDLE_UP 293
-#define CLIP_SLUG_RUN 294
-#define CLIP_SLUG_STARTLE 295
-#define CLIP_GFLY_BURST 296
-#define CLIP_GFLY_CHARGE 297
-#define CLIP_GFLY_CHARGE_ANTIC 298
-#define CLIP_GFLY_CHARGE_RECOVER 299
-#define CLIP_GFLY_DEATH 300
-#define CLIP_GFLY_FALL 301
-#define CLIP_GFLY_FLY 302
-#define CLIP_GFLY_GURGLE_LOOP 303
-#define CLIP_GFLY_GURGLE_ONCE 304
-#define CLIP_GFLY_SLAM_DOWN 305
-#define CLIP_GFLY_SLAM_END 306
-#define CLIP_GFLY_SLAM_UP 307
-#define CLIP_GFLY_SLEEP 308
-#define CLIP_GFLY_STOP 309
-#define CLIP_GFLY_WAKE 310
-#define CLIP_GFLY_WIGGLE 311
-#define CLIP_MOSSWALKER_APPEAR 312
-#define CLIP_MOSSWALKER_BURY 313
-#define CLIP_MOSSWALKER_DEATH_AIR 314
-#define CLIP_MOSSWALKER_DEATH_LAND 315
-#define CLIP_MOSSWALKER_SHAKE 316
-#define CLIP_MOSSWALKER_TURN 317
-#define CLIP_MOSSWALKER_WALK 318
-#define CLIP_PIGEON_FLY 319
-#define CLIP_PIGEON_IDLE_01 320
-#define CLIP_PIGEON_IDLE_02 321
-#define CLIP_PIGEON_IDLE_03 322
-#define CLIP_PLANTTRAP_DEATH 323
-#define CLIP_PLANTTRAP_IDLE 324
-#define CLIP_PLANTTRAP_RETRACT 325
-#define CLIP_PLANTTRAP_SNAP 326
-#define CLIP_PLANTTRAP_SNAP_READY 327
-#define CLIP_SHAKER_ATTACK 328
-#define CLIP_SHAKER_DEATH_AIR 329
-#define CLIP_SHAKER_DEATH_LAND 330
-#define CLIP_SHAKER_IDLE 331
-#define CLIP_SHAKER_TURN 332
-#define CLIP_SHAKER_WALK 333
-#define CLIP_MOSQUITO_ATTACK 334
-#define CLIP_MOSQUITO_ATTACK_ANTIC 335
-#define CLIP_MOSQUITO_DEATH_AIR 336
-#define CLIP_MOSQUITO_DEATH_LAND 337
-#define CLIP_MOSQUITO_IDLE 338
-#define CLIP_MOSQUITO_STARTLE 339
-#define CLIP_MOSQUITO_TURNTOIDLE 340
-#define CLIP_FATFLY_ATTACK 341
-#define CLIP_FATFLY_DEATH_AIR 342
-#define CLIP_FATFLY_DEATH_LAND 343
-#define CLIP_FATFLY_FLY 344
-#define CLIP_MOSSCHARGER_APPEAR 345
-#define CLIP_MOSSCHARGER_CHARGE 346
-#define CLIP_MOSSCHARGER_DEATH_AIR 347
-#define CLIP_MOSSCHARGER_DEATH_LAND 348
-#define CLIP_MOSSCHARGER_DISAPPEAR 349
-#define CLIP_MOSSCHARGER_ESCAPE 350
-#define CLIP_MOSSCHARGER_GET_UP 351
-#define CLIP_MOSSCHARGER_STUN 352
-#define CLIP_MOSSCHARGER_TURNRUN 353
-#define CLIP_MOSSKNIGHT_DEATH_AIR 354
-#define CLIP_MOSSKNIGHT_DEATH_LAND 355
-#define CLIP_MOSSKNIGHT_DORMANT_1 356
-#define CLIP_MOSSKNIGHT_DORMANT_2 357
-#define CLIP_MOSSKNIGHT_EVADE 358
-#define CLIP_MOSSKNIGHT_IDLE 359
-#define CLIP_MOSSKNIGHT_SHAKE 360
-#define CLIP_MOSSKNIGHT_SHIELD_FRONT 361
-#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 362
-#define CLIP_MOSSKNIGHT_SHIELD_TOP 363
-#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 364
-#define CLIP_MOSSKNIGHT_SHOOT 365
-#define CLIP_MOSSKNIGHT_SHOOT_END 366
-#define CLIP_MOSSKNIGHT_SLASH 367
-#define CLIP_MOSSKNIGHT_SLASH_2 368
-#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 369
-#define CLIP_MOSSKNIGHT_SLASH_EFFECT 370
-#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 371
-#define CLIP_MOSSKNIGHT_SLASH_END 372
-#define CLIP_MOSSKNIGHT_SLASH_QUICK 373
-#define CLIP_MOSSKNIGHT_TURN 374
-#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 375
-#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 376
-#define CLIP_MOSSKNIGHT_WAKE 377
-#define CLIP_MOSSKNIGHT_WALK 378
-#define CLIP_HORNET_A_DASH 379
-#define CLIP_HORNET_A_DASH_ANTIC 380
-#define CLIP_HORNET_AIR_DASH_EFFECT 381
-#define CLIP_HORNET_DEATH_AIR 382
-#define CLIP_HORNET_EVADE 383
-#define CLIP_HORNET_EVADE_ANTIC 384
-#define CLIP_HORNET_FALL 385
-#define CLIP_HORNET_FLASH 386
-#define CLIP_HORNET_FLOURISH 387
-#define CLIP_HORNET_G_DASH 388
-#define CLIP_HORNET_G_DASH_ANTIC 389
-#define CLIP_HORNET_G_DASH_EFFECT 390
-#define CLIP_HORNET_G_DASH_RECOVER1 391
-#define CLIP_HORNET_G_DASH_RECOVER2 392
-#define CLIP_HORNET_HARD_LAND 393
-#define CLIP_HORNET_IDLE 394
-#define CLIP_HORNET_JUMP 395
-#define CLIP_HORNET_JUMP_ANTIC 396
-#define CLIP_HORNET_LAND 397
-#define CLIP_HORNET_NEEDLE 398
-#define CLIP_HORNET_NEEDLE_THREAD 399
-#define CLIP_HORNET_RUN 400
-#define CLIP_HORNET_SPHERE_ANTIC_A 401
-#define CLIP_HORNET_SPHERE_ANTIC_G 402
-#define CLIP_HORNET_SPHERE_ATTACK 403
-#define CLIP_HORNET_SPHERE_BALL 404
-#define CLIP_HORNET_SPHERE_RECOVER_A 405
-#define CLIP_HORNET_SPHERE_RECOVER_G 406
-#define CLIP_HORNET_STUN 407
-#define CLIP_HORNET_STUN_AIR 408
-#define CLIP_HORNET_THROW 409
-#define CLIP_HORNET_THROW_ANTIC 410
-#define CLIP_HORNET_THROW_EFFECT 411
-#define CLIP_HORNET_THROW_RECOVER 412
-#define CLIP_HORNET_WALL_IMPACT 413
-#define CLIP_HORNET_WOUNDED 414
-#define CLIP_BGATE_BG_OPENED 415
-#define CLIP_BGATE_BG_CLOSE_1 416
-#define CLIP_BGATE_BG_CLOSE_2 417
-#define CLIP_BGATE_BG_OPEN 418
-#define CLIP_BGATE_BG_CLOSED 419
-#define CLIP_BGATE_BONE_GATE_OPENED 420
-#define CLIP_BGATE_BONE_GATE_CLOSE 421
-#define CLIP_BGATE_BONE_GATE_CLOSED 422
-#define CLIP_BGATE_BONE_GATE_OPEN 423
-#define CLIP_COCOON_COCOON_IDLE 424
-#define CLIP_COCOON_COCOON_SWEAT 425
-#define CLIP_COCOON_SCUTTLER_LAND 426
-#define CLIP_COCOON_SCUTTLER_RUN 427
-#define CLIP_FX_SPLAT 428
-#define CLIP_FX_SPLAT2 429
-#define CLIP_FIREBALL_BLAST 430
-#define CLIP_FIREBALL_BALL 431
-#define CLIP_FIREBALL_BALL_END 432
-#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 433
-#define CLIP_DRIP_IDLE 434
-#define CLIP_DRIP_DRIP 435
-#define CLIP_DRIP_FALL 436
-#define CLIP_DRIP_IMPACT 437
-#define CLIP_HORNETCS_EVADE 438
-#define CLIP_HORNETCS_EVADE_ANTIC 439
-#define CLIP_HORNETCS_HARPOON_SIDE 440
-#define CLIP_HORNETCS_IDLE 441
-#define CLIP_HORNETCS_JUMP_FULL 442
-#define CLIP_HORNETCS_POINT 443
-#define CLIP_HORNETCS_SOFT_LAND 444
-#define CLIP_HORNETCS_THREAD_1 445
-#define CLIP_HORNETCS_THROW_SIDE 446
-#define CLIP_HORNETCS_THROW_SIDE_START 447
-#define CLIP_HORNETCS_TURN 448
-#define CLIP_HORNETCS_TURNTOIDLE 449
-#define CLIP_BULLET_IDLE 450
-#define CLIP_BULLET_IMPACT 451
-#define CLIP_BULLET_SHOCKWAVE_SPURT 452
-#define CLIP_PROP0_WATERFALL_LOOP 453
-#define CLIP_PROP1_TORCH2 454
-#define CLIP_PROP1_TORCH3 455
-#define CLIP_VM0_FLOWER 456
-#define CLIP_VM0_IDLE 457
-#define CLIP_VM0_REACH 458
-#define CLIP_VM0_REACH_TO_IDLE 459
-#define CLIP_VM0_TALK_LEFT 460
-#define CLIP_VM0_TALK_RIGHT 461
-#define CLIP_VM0_TURN_LEFT 462
-#define CLIP_VM0_TURN_RIGHT 463
-#define CLIP_VM3_IDLE 464
-#define CLIP_VM3_SIT_IDLE 465
-#define CLIP_VM3_SIT_TALK 466
-#define CLIP_VM3_SIT_TALK_END 467
-#define CLIP_VM3_SUMMON 468
-#define CLIP_VM3_TALK 469
-#define CLIP_VM3_TALK_END 470
-#define CLIP_VM3_TURN 471
-#define SPRITE_HERO_LIGHT 2017
-#define SPRITE_DIALOGUE_BACKBOARD 2018
-#define SPRITE_PROMPT_SHADOW 2019
-#define SPRITE_CORPSE_NAIL 2020
-#define SPRITE_FK_BARREL 2021
-#define SPRITE_FK_STAFF 2022
-#define SPRITE_DIGIT0 2222
+#define CLIP_PROMPT_ENTER_DOWN 128
+#define CLIP_PROMPT_ENTER_IDLE 129
+#define CLIP_PROMPT_ENTER_UP 130
+#define CLIP_PROMPT_IDLE 131
+#define CLIP_PROMPT_LISTEN_DOWN 132
+#define CLIP_PROMPT_LISTEN_IDLE 133
+#define CLIP_PROMPT_LISTEN_UP 134
+#define CLIP_PROMPT_UP 135
+#define CLIP_SHADE_APPEAR 136
+#define CLIP_SHADE_CAST 137
+#define CLIP_SHADE_CAST_ANTIC 138
+#define CLIP_SHADE_CAST_CHARGE 139
+#define CLIP_SHADE_CAST_RING 140
+#define CLIP_SHADE_DEATH 141
+#define CLIP_SHADE_DEATH_GLOW 142
+#define CLIP_SHADE_DEATH_START 143
+#define CLIP_SHADE_DEPART 144
+#define CLIP_SHADE_FIREBALL 145
+#define CLIP_SHADE_FIREBALL_END 146
+#define CLIP_SHADE_FLY 147
+#define CLIP_SHADE_IDLE 148
+#define CLIP_SHADE_RETREAT_END 149
+#define CLIP_SHADE_RETREAT_START 150
+#define CLIP_SHADE_SLASH 151
+#define CLIP_SHADE_SLASH_ANTIC 152
+#define CLIP_SHADE_SLASH_CD 153
+#define CLIP_SHADE_SLASH_EFFECT 154
+#define CLIP_SHADE_STARTLE 155
+#define CLIP_SHADE_TURNTOFLY 156
+#define CLIP_SHADE_TURNTOIDLE 157
+#define CLIP_CRAWLER_WALK 158
+#define CLIP_CRAWLER_TURN 159
+#define CLIP_CRAWLER_IDLE 160
+#define CLIP_CRAWLER_DEATH_AIR 161
+#define CLIP_CRAWLER_DEATH_LAND 162
+#define CLIP_BUZZER_CHASE 163
+#define CLIP_BUZZER_IDLE 164
+#define CLIP_BUZZER_STARTLE 165
+#define CLIP_BUZZER_DEATH_AIR 166
+#define CLIP_BUZZER_DEATH_LAND 167
+#define CLIP_BUZZER_FLY 168
+#define CLIP_BUZZER_TURNTOFLY 169
+#define CLIP_BUZZER_TURNTOIDLE 170
+#define CLIP_TIKTIK_DEATH_AIR 171
+#define CLIP_TIKTIK_DEATH_LAND 172
+#define CLIP_TIKTIK_STUN 173
+#define CLIP_TIKTIK_WALK 174
+#define CLIP_GRUZZER_DEATH_AIR 175
+#define CLIP_GRUZZER_DEATH_LAND 176
+#define CLIP_GRUZZER_FLY 177
+#define CLIP_ASPID_DEATH_AIR 178
+#define CLIP_ASPID_FIRE_LONG 179
+#define CLIP_ASPID_FLY 180
+#define CLIP_ASPID_TURNTOFLY 181
+#define CLIP_BALDUR_DEATH_AIR 182
+#define CLIP_BALDUR_DEATH_LAND 183
+#define CLIP_BALDUR_IDLE 184
+#define CLIP_BALDUR_ROLL 185
+#define CLIP_BALDUR_START 186
+#define CLIP_BALDUR_STOP 187
+#define CLIP_ELDERBALDUR_CLOSE1 188
+#define CLIP_ELDERBALDUR_CLOSE2 189
+#define CLIP_ELDERBALDUR_CLOSED 190
+#define CLIP_ELDERBALDUR_DEATH 191
+#define CLIP_ELDERBALDUR_DEATH_STUN 192
+#define CLIP_ELDERBALDUR_HIT 193
+#define CLIP_ELDERBALDUR_IDLE 194
+#define CLIP_ELDERBALDUR_OPEN 195
+#define CLIP_ELDERBALDUR_SHOOT_ANTIC 196
+#define CLIP_ELDERBALDUR_SHOOT_CD 197
+#define CLIP_HUSK_ATTACK_ANTICIPATE 198
+#define CLIP_HUSK_ATTACK_COOLDOWN 199
+#define CLIP_HUSK_ATTACK_LUNGE 200
+#define CLIP_HUSK_DEATH_AIR 201
+#define CLIP_HUSK_DEATH_LAND 202
+#define CLIP_HUSK_IDLE 203
+#define CLIP_HUSK_TURN 204
+#define CLIP_HUSK_WALK 205
+#define CLIP_BARGER_ATTACK_ANTICIPATE 206
+#define CLIP_BARGER_ATTACK_COOLDOWN 207
+#define CLIP_BARGER_ATTACK_LUNGE 208
+#define CLIP_BARGER_DEATH_AIR 209
+#define CLIP_BARGER_DEATH_LAND 210
+#define CLIP_BARGER_IDLE 211
+#define CLIP_BARGER_TURN 212
+#define CLIP_BARGER_WALK 213
+#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 214
+#define CLIP_HORNHEAD_ATTACK_COOLDOWN 215
+#define CLIP_HORNHEAD_ATTACK_LUNGE 216
+#define CLIP_HORNHEAD_DEATH_AIR 217
+#define CLIP_HORNHEAD_DEATH_LAND 218
+#define CLIP_HORNHEAD_IDLE 219
+#define CLIP_HORNHEAD_TURN 220
+#define CLIP_HORNHEAD_WALK 221
+#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 222
+#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 223
+#define CLIP_MOSSRUNNER_ATTACK_LUNGE 224
+#define CLIP_MOSSRUNNER_DEATH_AIR 225
+#define CLIP_MOSSRUNNER_DEATH_LAND 226
+#define CLIP_MOSSRUNNER_IDLE 227
+#define CLIP_MOSSRUNNER_TURN 228
+#define CLIP_MOSSRUNNER_WALK 229
+#define CLIP_LEAPER_ATTACK 230
+#define CLIP_LEAPER_DEATH_AIR 231
+#define CLIP_LEAPER_DEATH_LAND 232
+#define CLIP_LEAPER_IDLE 233
+#define CLIP_LEAPER_LAND 234
+#define CLIP_LEAPER_TURN 235
+#define CLIP_LEAPER_WALK 236
+#define CLIP_GUARD_ANTICIPATE 237
+#define CLIP_GUARD_ATTACK2 238
+#define CLIP_GUARD_DEATH_AIR 239
+#define CLIP_GUARD_DEATH_LAND 240
+#define CLIP_GUARD_DORMANT 241
+#define CLIP_GUARD_IDLE 242
+#define CLIP_GUARD_RUN 243
+#define CLIP_GUARD_STARTLE 244
+#define CLIP_GUARD_STOMP_ANTIC 245
+#define CLIP_GUARD_STOMP_JUMP 246
+#define CLIP_GUARD_STOMP_LAND 247
+#define CLIP_GUARD_STOP_RUN 248
+#define CLIP_GUARD_STOP_WALK 249
+#define CLIP_GUARD_SWIPE 250
+#define CLIP_GUARD_TURN 251
+#define CLIP_GUARD_WAKE 252
+#define CLIP_GUARD_WALK 253
+#define CLIP_FK_ATTACK 254
+#define CLIP_FK_ATTACK_ANTIC 255
+#define CLIP_FK_ATTACK_RECOVER 256
+#define CLIP_FK_BLANK 257
+#define CLIP_FK_BODY 258
+#define CLIP_FK_DEATH_FALL 259
+#define CLIP_FK_DEATH_HEAD_1 260
+#define CLIP_FK_DEATH_HEAD_2 261
+#define CLIP_FK_DEATH_LAND 262
+#define CLIP_FK_DEATH_SPAZ 263
+#define CLIP_FK_IDLE 264
+#define CLIP_FK_JUMP 265
+#define CLIP_FK_JUMP_ANTIC 266
+#define CLIP_FK_JUMP_ATTACK_HIT_1 267
+#define CLIP_FK_JUMP_ATTACK_HIT_2 268
+#define CLIP_FK_JUMP_ATTACK_HIT_3 269
+#define CLIP_FK_JUMP_ATTACK_UP 270
+#define CLIP_FK_LAND 271
+#define CLIP_FK_RAGE 272
+#define CLIP_FK_RUN 273
+#define CLIP_FK_RUN_ANTIC 274
+#define CLIP_FK_STUN_HIT 275
+#define CLIP_FK_STUN_OPEN 276
+#define CLIP_FK_STUN_OPENED 277
+#define CLIP_FK_STUN_RECOVER 278
+#define CLIP_FK_STUN_ROLL 279
+#define CLIP_FK_STUN_ROLL_END 280
+#define CLIP_FK_TURN 281
+#define CLIP_FKHEAD_DEATH_LAND 282
+#define CLIP_FKHEAD_HEAD_HIT 283
+#define CLIP_FKHEAD_HEAD_IDLE 284
+#define CLIP_FKHEAD_HEAD_SPAZ 285
+#define CLIP_HATCHER_DEATH_AIR 286
+#define CLIP_HATCHER_DEATH_LAND 287
+#define CLIP_HATCHER_FIRE 288
+#define CLIP_HATCHER_FLY 289
+#define CLIP_HATCHLING_FLY 290
+#define CLIP_SLUG_BOUNCE 291
+#define CLIP_SLUG_DEATH_AIR 292
+#define CLIP_SLUG_DEATH_LAND 293
+#define CLIP_SLUG_IDLE_TODOWN 294
+#define CLIP_SLUG_IDLE_TOUP 295
+#define CLIP_SLUG_IDLE_UP 296
+#define CLIP_SLUG_RUN 297
+#define CLIP_SLUG_STARTLE 298
+#define CLIP_GFLY_BURST 299
+#define CLIP_GFLY_CHARGE 300
+#define CLIP_GFLY_CHARGE_ANTIC 301
+#define CLIP_GFLY_CHARGE_RECOVER 302
+#define CLIP_GFLY_DEATH 303
+#define CLIP_GFLY_FALL 304
+#define CLIP_GFLY_FLY 305
+#define CLIP_GFLY_GURGLE_LOOP 306
+#define CLIP_GFLY_GURGLE_ONCE 307
+#define CLIP_GFLY_SLAM_DOWN 308
+#define CLIP_GFLY_SLAM_END 309
+#define CLIP_GFLY_SLAM_UP 310
+#define CLIP_GFLY_SLEEP 311
+#define CLIP_GFLY_STOP 312
+#define CLIP_GFLY_WAKE 313
+#define CLIP_GFLY_WIGGLE 314
+#define CLIP_MOSSWALKER_APPEAR 315
+#define CLIP_MOSSWALKER_BURY 316
+#define CLIP_MOSSWALKER_DEATH_AIR 317
+#define CLIP_MOSSWALKER_DEATH_LAND 318
+#define CLIP_MOSSWALKER_SHAKE 319
+#define CLIP_MOSSWALKER_TURN 320
+#define CLIP_MOSSWALKER_WALK 321
+#define CLIP_PIGEON_FLY 322
+#define CLIP_PIGEON_IDLE_01 323
+#define CLIP_PIGEON_IDLE_02 324
+#define CLIP_PIGEON_IDLE_03 325
+#define CLIP_PLANTTRAP_DEATH 326
+#define CLIP_PLANTTRAP_IDLE 327
+#define CLIP_PLANTTRAP_RETRACT 328
+#define CLIP_PLANTTRAP_SNAP 329
+#define CLIP_PLANTTRAP_SNAP_READY 330
+#define CLIP_SHAKER_ATTACK 331
+#define CLIP_SHAKER_DEATH_AIR 332
+#define CLIP_SHAKER_DEATH_LAND 333
+#define CLIP_SHAKER_IDLE 334
+#define CLIP_SHAKER_TURN 335
+#define CLIP_SHAKER_WALK 336
+#define CLIP_MOSQUITO_ATTACK 337
+#define CLIP_MOSQUITO_ATTACK_ANTIC 338
+#define CLIP_MOSQUITO_DEATH_AIR 339
+#define CLIP_MOSQUITO_DEATH_LAND 340
+#define CLIP_MOSQUITO_IDLE 341
+#define CLIP_MOSQUITO_STARTLE 342
+#define CLIP_MOSQUITO_TURNTOIDLE 343
+#define CLIP_FATFLY_ATTACK 344
+#define CLIP_FATFLY_DEATH_AIR 345
+#define CLIP_FATFLY_DEATH_LAND 346
+#define CLIP_FATFLY_FLY 347
+#define CLIP_MOSSCHARGER_APPEAR 348
+#define CLIP_MOSSCHARGER_CHARGE 349
+#define CLIP_MOSSCHARGER_DEATH_AIR 350
+#define CLIP_MOSSCHARGER_DEATH_LAND 351
+#define CLIP_MOSSCHARGER_DISAPPEAR 352
+#define CLIP_MOSSCHARGER_ESCAPE 353
+#define CLIP_MOSSCHARGER_GET_UP 354
+#define CLIP_MOSSCHARGER_STUN 355
+#define CLIP_MOSSCHARGER_TURNRUN 356
+#define CLIP_MOSSKNIGHT_DEATH_AIR 357
+#define CLIP_MOSSKNIGHT_DEATH_LAND 358
+#define CLIP_MOSSKNIGHT_DORMANT_1 359
+#define CLIP_MOSSKNIGHT_DORMANT_2 360
+#define CLIP_MOSSKNIGHT_EVADE 361
+#define CLIP_MOSSKNIGHT_IDLE 362
+#define CLIP_MOSSKNIGHT_SHAKE 363
+#define CLIP_MOSSKNIGHT_SHIELD_FRONT 364
+#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 365
+#define CLIP_MOSSKNIGHT_SHIELD_TOP 366
+#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 367
+#define CLIP_MOSSKNIGHT_SHOOT 368
+#define CLIP_MOSSKNIGHT_SHOOT_END 369
+#define CLIP_MOSSKNIGHT_SLASH 370
+#define CLIP_MOSSKNIGHT_SLASH_2 371
+#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 372
+#define CLIP_MOSSKNIGHT_SLASH_EFFECT 373
+#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 374
+#define CLIP_MOSSKNIGHT_SLASH_END 375
+#define CLIP_MOSSKNIGHT_SLASH_QUICK 376
+#define CLIP_MOSSKNIGHT_TURN 377
+#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 378
+#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 379
+#define CLIP_MOSSKNIGHT_WAKE 380
+#define CLIP_MOSSKNIGHT_WALK 381
+#define CLIP_HORNET_A_DASH 382
+#define CLIP_HORNET_A_DASH_ANTIC 383
+#define CLIP_HORNET_AIR_DASH_EFFECT 384
+#define CLIP_HORNET_DEATH_AIR 385
+#define CLIP_HORNET_EVADE 386
+#define CLIP_HORNET_EVADE_ANTIC 387
+#define CLIP_HORNET_FALL 388
+#define CLIP_HORNET_FLASH 389
+#define CLIP_HORNET_FLOURISH 390
+#define CLIP_HORNET_G_DASH 391
+#define CLIP_HORNET_G_DASH_ANTIC 392
+#define CLIP_HORNET_G_DASH_EFFECT 393
+#define CLIP_HORNET_G_DASH_RECOVER1 394
+#define CLIP_HORNET_G_DASH_RECOVER2 395
+#define CLIP_HORNET_HARD_LAND 396
+#define CLIP_HORNET_IDLE 397
+#define CLIP_HORNET_JUMP 398
+#define CLIP_HORNET_JUMP_ANTIC 399
+#define CLIP_HORNET_LAND 400
+#define CLIP_HORNET_NEEDLE 401
+#define CLIP_HORNET_NEEDLE_THREAD 402
+#define CLIP_HORNET_RUN 403
+#define CLIP_HORNET_SPHERE_ANTIC_A 404
+#define CLIP_HORNET_SPHERE_ANTIC_G 405
+#define CLIP_HORNET_SPHERE_ATTACK 406
+#define CLIP_HORNET_SPHERE_BALL 407
+#define CLIP_HORNET_SPHERE_RECOVER_A 408
+#define CLIP_HORNET_SPHERE_RECOVER_G 409
+#define CLIP_HORNET_STUN 410
+#define CLIP_HORNET_STUN_AIR 411
+#define CLIP_HORNET_THROW 412
+#define CLIP_HORNET_THROW_ANTIC 413
+#define CLIP_HORNET_THROW_EFFECT 414
+#define CLIP_HORNET_THROW_RECOVER 415
+#define CLIP_HORNET_WALL_IMPACT 416
+#define CLIP_HORNET_WOUNDED 417
+#define CLIP_BGATE_BG_OPENED 418
+#define CLIP_BGATE_BG_CLOSE_1 419
+#define CLIP_BGATE_BG_CLOSE_2 420
+#define CLIP_BGATE_BG_OPEN 421
+#define CLIP_BGATE_BG_CLOSED 422
+#define CLIP_BGATE_BONE_GATE_OPENED 423
+#define CLIP_BGATE_BONE_GATE_CLOSE 424
+#define CLIP_BGATE_BONE_GATE_CLOSED 425
+#define CLIP_BGATE_BONE_GATE_OPEN 426
+#define CLIP_COCOON_COCOON_IDLE 427
+#define CLIP_COCOON_COCOON_SWEAT 428
+#define CLIP_COCOON_SCUTTLER_LAND 429
+#define CLIP_COCOON_SCUTTLER_RUN 430
+#define CLIP_FX_SPLAT 431
+#define CLIP_FX_SPLAT2 432
+#define CLIP_FIREBALL_BLAST 433
+#define CLIP_FIREBALL_BALL 434
+#define CLIP_FIREBALL_BALL_END 435
+#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 436
+#define CLIP_DRIP_IDLE 437
+#define CLIP_DRIP_DRIP 438
+#define CLIP_DRIP_FALL 439
+#define CLIP_DRIP_IMPACT 440
+#define CLIP_HORNETCS_EVADE 441
+#define CLIP_HORNETCS_EVADE_ANTIC 442
+#define CLIP_HORNETCS_FALL 443
+#define CLIP_HORNETCS_HARPOON_SIDE 444
+#define CLIP_HORNETCS_IDLE 445
+#define CLIP_HORNETCS_JUMP_FULL 446
+#define CLIP_HORNETCS_POINT 447
+#define CLIP_HORNETCS_SOFT_LAND 448
+#define CLIP_HORNETCS_THREAD_1 449
+#define CLIP_HORNETCS_THROW_SIDE 450
+#define CLIP_HORNETCS_THROW_SIDE_START 451
+#define CLIP_HORNETCS_TURN 452
+#define CLIP_HORNETCS_TURNTOIDLE 453
+#define CLIP_BULLET_IDLE 454
+#define CLIP_BULLET_IMPACT 455
+#define CLIP_BULLET_SHOCKWAVE_SPURT 456
+#define CLIP_PROP0_WATERFALL_LOOP 457
+#define CLIP_PROP1_TORCH2 458
+#define CLIP_PROP1_TORCH3 459
+#define CLIP_VM0_FLOWER 460
+#define CLIP_VM0_IDLE 461
+#define CLIP_VM0_REACH 462
+#define CLIP_VM0_REACH_TO_IDLE 463
+#define CLIP_VM0_TALK_LEFT 464
+#define CLIP_VM0_TALK_RIGHT 465
+#define CLIP_VM0_TURN_LEFT 466
+#define CLIP_VM0_TURN_RIGHT 467
+#define CLIP_VM3_IDLE 468
+#define CLIP_VM3_SIT_IDLE 469
+#define CLIP_VM3_SIT_TALK 470
+#define CLIP_VM3_SIT_TALK_END 471
+#define CLIP_VM3_SUMMON 472
+#define CLIP_VM3_TALK 473
+#define CLIP_VM3_TALK_END 474
+#define CLIP_VM3_TURN 475
+#define CLIP_ANIM0_DASH_CLOAK_CORPSE000 476
+#define CLIP_ANIM1_GROUND_PLINK_0 477
+#define CLIP_ANIM2_FIREBALL_COLLECT_ANIM 478
+#define SPRITE_HERO_LIGHT 2057
+#define SPRITE_DIALOGUE_BACKBOARD 2058
+#define SPRITE_PROMPT_SHADOW 2059
+#define SPRITE_CORPSE_NAIL 2060
+#define SPRITE_FK_BARREL 2061
+#define SPRITE_FK_STAFF 2062
+#define SPRITE_DIGIT0 2265
#define STYLE_DIALOGUE 0
#define STYLE_PROMPT 1
#define STYLE_TITLE_L 2
@@ -575,7 +582,7 @@
#define EK_MOSSKNIGHT 28
#define EK_HORNET 29
#define NUM_KINDS 30
-#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 156, 155, -1, -1, -1, -1, -1, -1, -1, -1, 158, 159}}, {EF_BUZZER, {161, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 163, 164}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 171, 170, -1, -1, -1, -1, -1, -1, -1, 168, 169}}, {EF_BOUNCER, {-1, -1, -1, 174, -1, -1, -1, -1, -1, -1, -1, 172, 173}}, {EF_SPITTER, {-1, -1, -1, 177, 178, 176, -1, -1, -1, -1, -1, 175, -1}}, {EF_ROLLER, {181, -1, -1, 183, 182, 184, -1, -1, -1, -1, -1, 179, 180}}, {EF_BLOCKER, {191, -1, -1, 187, 192, 185, 186, 193, 194, 190, 189, -1, 188}}, {EF_HUSK, {200, 201, 202, 195, 197, 196, -1, -1, -1, -1, -1, 198, 199}}, {EF_HUSK, {208, 209, 210, 203, 205, 204, -1, -1, -1, -1, -1, 206, 207}}, {EF_HUSK, {216, 217, 218, 211, 213, 212, -1, -1, -1, -1, -1, 214, 215}}, {EF_HUSK, {224, 225, 226, 219, 221, 220, -1, -1, -1, -1, -1, 222, 223}}, {EF_LEAPER, {230, 232, 233, 227, 231, -1, -1, -1, -1, -1, -1, 228, 229}}, {EF_GUARD, {239, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 236, 237}}, {EF_FK, {261, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 259}}, {EF_FKHEAD, {281, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 279}}, {EF_HATCHER, {-1, -1, -1, 286, 285, -1, -1, -1, -1, -1, -1, 283, 284}}, {EF_HATCHLING, {-1, -1, -1, 287, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {293, -1, -1, 291, 292, 295, 294, 288, -1, -1, -1, 289, 290}}, {EF_GFLY, {308, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 317, 318, 316, 312, 313, -1, -1, -1, -1, -1, 314, 315}}, {EF_PIGEON, {-1, -1, -1, 320, 321, 322, 319, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {324, -1, -1, 327, 326, 325, -1, -1, -1, -1, -1, 323, -1}}, {EF_SHAKER, {331, 332, 333, 328, -1, -1, -1, -1, -1, -1, -1, 329, 330}}, {EF_MOSQUITO, {338, -1, -1, 340, 339, 335, 334, -1, -1, -1, -1, 336, 337}}, {EF_FATFLY, {344, -1, -1, 341, -1, -1, -1, -1, -1, -1, -1, 342, 343}}, {EF_MOSSCHARGER, {-1, -1, -1, 345, 346, 349, 352, 351, 353, 350, -1, 347, 348}}, {EF_MOSSKNIGHT, {359, 374, 378, -1, -1, -1, -1, -1, -1, -1, -1, 354, 355}}, {EF_HORNET, {394, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 382, -1}}}
+#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 159, 158, -1, -1, -1, -1, -1, -1, -1, -1, 161, 162}}, {EF_BUZZER, {164, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 166, 167}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 174, 173, -1, -1, -1, -1, -1, -1, -1, 171, 172}}, {EF_BOUNCER, {-1, -1, -1, 177, -1, -1, -1, -1, -1, -1, -1, 175, 176}}, {EF_SPITTER, {-1, -1, -1, 180, 181, 179, -1, -1, -1, -1, -1, 178, -1}}, {EF_ROLLER, {184, -1, -1, 186, 185, 187, -1, -1, -1, -1, -1, 182, 183}}, {EF_BLOCKER, {194, -1, -1, 190, 195, 188, 189, 196, 197, 193, 192, -1, 191}}, {EF_HUSK, {203, 204, 205, 198, 200, 199, -1, -1, -1, -1, -1, 201, 202}}, {EF_HUSK, {211, 212, 213, 206, 208, 207, -1, -1, -1, -1, -1, 209, 210}}, {EF_HUSK, {219, 220, 221, 214, 216, 215, -1, -1, -1, -1, -1, 217, 218}}, {EF_HUSK, {227, 228, 229, 222, 224, 223, -1, -1, -1, -1, -1, 225, 226}}, {EF_LEAPER, {233, 235, 236, 230, 234, -1, -1, -1, -1, -1, -1, 231, 232}}, {EF_GUARD, {242, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 239, 240}}, {EF_FK, {264, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 262}}, {EF_FKHEAD, {284, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 282}}, {EF_HATCHER, {-1, -1, -1, 289, 288, -1, -1, -1, -1, -1, -1, 286, 287}}, {EF_HATCHLING, {-1, -1, -1, 290, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {296, -1, -1, 294, 295, 298, 297, 291, -1, -1, -1, 292, 293}}, {EF_GFLY, {311, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 320, 321, 319, 315, 316, -1, -1, -1, -1, -1, 317, 318}}, {EF_PIGEON, {-1, -1, -1, 323, 324, 325, 322, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {327, -1, -1, 330, 329, 328, -1, -1, -1, -1, -1, 326, -1}}, {EF_SHAKER, {334, 335, 336, 331, -1, -1, -1, -1, -1, -1, -1, 332, 333}}, {EF_MOSQUITO, {341, -1, -1, 343, 342, 338, 337, -1, -1, -1, -1, 339, 340}}, {EF_FATFLY, {347, -1, -1, 344, -1, -1, -1, -1, -1, -1, -1, 345, 346}}, {EF_MOSSCHARGER, {-1, -1, -1, 348, 349, 352, 355, 354, 356, 353, -1, 350, 351}}, {EF_MOSSKNIGHT, {362, 377, 381, -1, -1, -1, -1, -1, -1, -1, -1, 357, 358}}, {EF_HORNET, {397, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 385, -1}}}
#define TXT_PROMPT_LISTEN 28
#define TXT_PROMPT_REST 29
#define TXT_PROMPT_INSPECT 30
@@ -700,8 +707,8 @@
#define VMEV_BG_DESTROY 19
#define VMEV_WAKE 20
#define VMSTR_NPC_TITLE 14
-#define VMSTR_VISITED 149
-#define VMSTR_DISPLAY_RIGHT 150
+#define VMSTR_VISITED 173
+#define VMSTR_DISPLAY_RIGHT 174
#define VMSTR_HORNET_SAVER 83
#define STR_ATTACK_RANGE 23
#define STR_EVADE_RANGE 50
@@ -731,17 +738,19 @@
#define TITLE_CHARM_SLUG 19
#define NUM_TITLES 20
#define TITLE_TABLE {{42, 43, -1, -1}, {44, 45, 46, -1}, {47, 48, -1, 49}, {50, 51, -1, 52}, {53, 54, -1, 55}, {56, 57, -1, -1}, {58, 59, 60, -1}, {61, 62, -1, -1}, {63, 64, -1, -1}, {65, 66, -1, -1}, {67, 68, -1, -1}, {69, 70, -1, -1}, {71, 72, -1, -1}, {73, 74, -1, -1}, {75, 76, -1, 77}, {78, 79, -1, 80}, {78, 79, -1, 81}, {82, 83, 84, -1}, {82, 83, -1, -1}, {85, 86, -1, 87}}
-#define SPRITE_FLEUR_TOP 2023
+#define SPRITE_FLEUR_TOP 2063
#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 2024
+#define SPRITE_FLEUR_BOT 2064
#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 2025
-#define SPRITE_MSG_STOP 2026
-#define SPRITE_MSG_FLEUR 2027
-#define SPRITE_MSG_KEY 2028
-#define SPRITE_MSG_ICON_FIREBALL 2029
-#define SPRITE_GRASS_BALL 2030
-#define MSG_TABLE {{88, 89, 90, 91, 92, 93}}
+#define SPRITE_MSG_BG 2065
+#define SPRITE_MSG_STOP 2066
+#define SPRITE_MSG_FLEUR 2067
+#define SPRITE_MSG_KEY 2068
+#define SPRITE_MSG_ICON_FIREBALL 2069
+#define SPRITE_MSG_ICON_DASH 2070
+#define SPRITE_GRASS_BALL 2071
+#define MSG_TABLE {{88, 89, 90, 91, 92, 93}, {94, 95, 96, 97, 98, 99}}
#define MSG_FIREBALL 0
+#define MSG_DASH 1
diff --git a/games/hollowknight/src/msg.c b/games/hollowknight/src/msg.c
index 91589b82..74b68326 100644
--- a/games/hollowknight/src/msg.c
+++ b/games/hollowknight/src/msg.c
@@ -8,7 +8,7 @@
#define HUD_PX (FOCAL / (-1.342f - CAM_Z))
static const int16_t table[][6] = MSG_TABLE; /* (name, prefix, Tap or Press, the two lines, the key's name) */
-static const int16_t icons[] = {SPRITE_MSG_ICON_FIREBALL};
+static const int16_t icons[] = {SPRITE_MSG_ICON_FIREBALL, SPRITE_MSG_ICON_DASH};
enum { MS_OFF, MS_TOP_UP, MS_BOT_UP, MS_STOP_UP, MS_DETECT, MS_DOWN };
/* (color_fader: what fades together; each its delay going up) */
diff --git a/games/hollowknight/src/vm.c b/games/hollowknight/src/vm.c
index 61d9e944..99b4e608 100644
--- a/games/hollowknight/src/vm.c
+++ b/games/hollowknight/src/vm.c
@@ -24,6 +24,7 @@ enum { OF_ACTIVE = 1, OF_RENDERER = 2, OF_ANIMATOR = 4, OF_TRIGGER = 8, OF_COLLI
OF_COND_OFF = 256, /* (not there: its condition) */
OF_SPELL_HIT = 512, OF_SPELL_IN = 1024, OF_SPELL_WAS = 2048 }; /* (a spell in its trigger) */
#define OF_ANIM_OFF 32 /* (its record's: off once its clip is over, DeactivateAfter2dtkAnimation) */
+#define OF_WAVE 64 /* (its record's: WaveEffectControl, grows and fades as it is on: bx its speed, by its scale) */
#define OF_STARTED 4 /* (its own: its animator started, the first time it was on) */
enum { M_ENTER, M_UPDATE, M_FIXED };
@@ -161,6 +162,7 @@ static bool pd_bool(uint16_t s) {
uint16_t c = str_pd(s);
if (c == 0xFFF0) return g_pd.disable_pause;
if (c == 0xFFF1) return g_pd.has_spell;
+ if (c == 0xFFF2) return g_pd.can_dash;
if (c == 0xFFFD) return true;
if (c >= PDF_COUNT) return false;
return pd_flag(c);
@@ -169,6 +171,8 @@ static void pd_set_bool(uint16_t s, bool on) {
uint16_t c = str_pd(s);
if (c == 0xFFF0) g_pd.disable_pause = on;
else if (c == 0xFFF1) g_pd.has_spell = on;
+ else if (c == 0xFFF2) g_pd.can_dash = on;
+ else if (c == PDF_HAS_DASH) pd_set_flag(c, on), g_pd.has_dash = on; /* (kept twice) */
else if (c < PDF_COUNT) pd_set_flag(c, on);
}
/* (tools/vm.py: PD_INTS) */
@@ -304,6 +308,7 @@ static void obj_set_active(int o, bool on) {
if (on) vm.objs[o].flags |= OF_ACTIVE;
else vm.objs[o].flags &= (uint16_t)~OF_ACTIVE;
if (!was && on) anims_start();
+ if (!was && on && (vm.rec[o].flags & OF_WAVE)) vm.objs[o].anim.time = 0; /* (its wave from the start) */
/* (an FSM starts again as its object comes on: RestartOnEnable) */
if (!was && on)
for (int i = 0; i < vm.nfsms; i++) {
@@ -850,9 +855,10 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
case VMOP_SETFSMBOOL:
case VMOP_SETFSMSTRING: {
int o = oval(f, rv(&r));
- rv(&r);
+ uint16_t fname = (uint16_t)val(f, rv(&r));
uint16_t var = (uint16_t)val(f, rv(&r));
uint32_t x = val(f, rv(&r));
+ uint8_t slot = rb(&r);
if (o == O_AREA_TITLE) {
/* (Area Title's variables: NPC Title, Visited, Display Right, Area Event) */
int t = str_title(var);
@@ -861,7 +867,10 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
else if (var == VMSTR_NPC_TITLE) vm.title_npc = x;
else if (var == VMSTR_VISITED) vm.title_visited = x;
else if (var == VMSTR_DISPLAY_RIGHT) vm.title_right = x;
- }
+ } else if (obj_ok(o) && slot != 255)
+ /* (another FSM's variable: its FSMs of that name) */
+ for (int i = 0; i < vm.nfsms; i++)
+ if (vm.fsms[i].owner == o && vm.fsms[i].name == fname) set_var(&vm.fsms[i], slot, x);
return true;
}
case VMOP_STARTCONVERSATION:
@@ -892,6 +901,7 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
case 11: save_set_respawn("Death Respawn Marker", true); break;
case 15: save_game(); break;
case 16: hero_gravity(a0 != 0); break;
+ case 19: set_var(f, store, hero_can_talk()); break; /* (CanInspect: as CanTalk) */
}
return true;
}
@@ -1157,6 +1167,11 @@ void vm_tick(void) {
bool in = on && hero_box_in(i), spell = on && (o->flags & OF_SPELL_HIT);
o->flags = (uint16_t)((in ? o->flags | OF_INSIDE : o->flags & ~OF_INSIDE) & ~OF_SPELL_HIT);
o->flags = (uint16_t)(spell ? o->flags | OF_SPELL_IN : o->flags & ~OF_SPELL_IN);
+ if (vm.rec[i].flags & OF_WAVE) {
+ /* (WaveEffectControl: its timer at its speed; past 1, off) */
+ if (obj_active(i) && (o->anim.time += DT * vm.rec[i].bx) > 1) obj_set_active(i, false);
+ continue;
+ }
o->anim.events = 0;
anim_update(&o->anim, DT);
if ((vm.rec[i].flags & OF_ANIM_OFF) && (o->anim.events & ANIM_DONE)) obj_set_active(i, false);
@@ -1206,7 +1221,12 @@ void vm_draw(void) {
int sprite = (r->flags & OF_ANIMATOR) ? o->anim.sprite : (r->sprite == NONE ? -1 : r->sprite);
if (sprite < 0) continue;
Inst in;
- sprite_inst(sprite, o->x, o->y, r->z, o->sx, o->sy, 0, &in);
+ if (r->flags & OF_WAVE) {
+ /* (its scale 1 + 4 t, its alpha 1 - t) */
+ float t = o->anim.time, k = (1 + 4 * t) * r->by;
+ sprite_inst(sprite, o->x, o->y, r->z, k, k, gfx_dyn_tint(28, 255, 255, 255, (uint8_t)(255 * (1 - t))), &in);
+ } else
+ sprite_inst(sprite, o->x, o->y, r->z, o->sx, o->sy, 0, &in);
in.flags = (uint8_t)((in.flags & ~F_BLEND) | r->blend);
gfx_actor(&in, SORT_KEY(r->layer, r->order));
}
diff --git a/games/hollowknight/tools/actors.py b/games/hollowknight/tools/actors.py
index 9783b120..fe94b045 100644
--- a/games/hollowknight/tools/actors.py
+++ b/games/hollowknight/tools/actors.py
@@ -216,6 +216,38 @@ ACTOR_SCALE = {"hud": HUD_K / K0, "liquid": 1.4 * HUD_K / K0, "dialogue": text.T
HUD_MASK = 0.7135
+# Unity Animators' clips (a sprite each frame): actor -> [(clip name, fps, loops, [sprite (file, path id)], scale)]
+ANIMATOR_ACTORS = {}
+
+
+def animator_clip(path, controller):
+ """An AnimatorController's first clip that swaps its SpriteRenderer's sprite -> (name, fps, loops, [sprite (file,
+ path id)]): its keys at even steps (its streamed clip's)."""
+ import struct
+ af = unity.asset_file(path)
+ ct = af.objects[controller].read_typetree()
+ cr = ct["m_AnimationClips"][0]
+ t = af.objects[cr["m_PathID"]].read_typetree()
+ sprites = [(path, m["m_PathID"]) for m in t["m_ClipBindingConstant"]["pptrCurveMapping"]]
+ mc = t["m_MuscleClip"]
+ b = struct.pack("<%dI" % len(mc["m_Clip"]["data"]["m_StreamedClip"]["data"]), *mc["m_Clip"]["data"]["m_StreamedClip"]["data"])
+ keys, i = [], 0
+ while i < len(b):
+ tm, n = struct.unpack_from("<fI", b, i)
+ i += 8
+ for _ in range(n):
+ ci, = struct.unpack_from("<I", b, i)
+ v = struct.unpack_from("<4f", b, i + 4)[3]
+ i += 20
+ if tm < 1e30:
+ keys.append((max(0.0, tm), int(round(v)))) # (the first at -infinity: its value at the start)
+ rate = float(t["m_SampleRate"])
+ for k, (tm, v) in enumerate(keys):
+ assert abs(tm - k / rate) < 1e-3, (path, controller, keys)
+ frames = [sprites[v] for _, v in keys]
+ return unity.S(t["m_Name"]), rate, bool(mc.get("m_LoopTime")), frames
+
+
def clip_id(actor, name):
return "".join(c if c.isalnum() else "_" for c in ("CLIP_%s_%s" % (actor, name)).upper())
@@ -256,6 +288,28 @@ def build():
pal = art.joint_palette([sprites[i]["job"].arr for i in new])
for i in new:
sprites[i]["job"].pal = pal
+ for actor, cl in ANIMATOR_ACTORS.items():
+ for name, fps, loops, keys, scale in cl:
+ frames = []
+ for key in keys:
+ k = key + (scale,)
+ if k not in index:
+ sp = unity.sprite_by_key(key)
+ img = unity.sprite_image(sp)
+ wu, hu = sp.w / sp.ppu * scale, sp.h / sp.ppu * scale
+ w, h = max(1, round(wu * K0)), max(1, round(hu * K0))
+ index[k] = len(sprites)
+ sprites.append({"key": k, "job": art.ImageJob(np.asarray(img.resize((w, h), Image.BOX)).copy(),
+ "%s/%s" % (actor, name)),
+ "lx": -sp.px * wu / scale, "ty": (1 - sp.py) * hu / scale, "tu": wu / scale / w,
+ "tv": hu / scale / h, "col": None})
+ frames.append((index[k], False))
+ clips.append({"id": clip_id(actor, name), "fps": fps, "wrap": 0 if loops else 2, "loop": 0, "frames": frames})
+ new = sorted({i for i, _ in frames if sprites[i]["job"].pal is None})
+ if new:
+ pal = art.joint_palette([sprites[i]["job"].arr for i in new])
+ for i in new:
+ sprites[i]["job"].pal = pal
return sprites, clips
diff --git a/games/hollowknight/tools/ents.py b/games/hollowknight/tools/ents.py
index fb60d4bd..7b1c5664 100644
--- a/games/hollowknight/tools/ents.py
+++ b/games/hollowknight/tools/ents.py
@@ -234,8 +234,8 @@ def pd_flags():
out = {}
for i, n in enumerate(ids):
# (Cornifer's: "corn_greenpathLeft")
- c = "Corn_" + camel(n[9:]) if n.startswith("PDF_CORN_") else camel(n[4:])
- out[c[0].lower() + c[1:]] = i
+ c = camel(n[9:]) if n.startswith("PDF_CORN_") else camel(n[4:])
+ out[("corn_" if n.startswith("PDF_CORN_") else "") + c[0].lower() + c[1:]] = i
return out
diff --git a/games/hollowknight/tools/pack.py b/games/hollowknight/tools/pack.py
index 316454de..cc03949f 100644
--- a/games/hollowknight/tools/pack.py
+++ b/games/hollowknight/tools/pack.py
@@ -484,6 +484,7 @@ def main():
sr = next(c["v"] for c in o["c"] if c["type"] == "SpriteRenderer")
fleurs["SPRITE_MSG_" + name] = SPRITES.id(pmsg, ref or sr["m_Sprite"], max(o["lscale"][:2]), res)
fleurs["SPRITE_MSG_ICON_FIREBALL"] = SPRITES.id(unity.scene("Crossroads_ShamanTemple"), [4, 44], 1.5607, hud_res)
+ fleurs["SPRITE_MSG_ICON_DASH"] = SPRITES.id(unity.scene("Fungus1_04"), [10, 22], 1.5607, hud_res)
# (a Moss Knight's grass ball: a Unity sprite)
pgb = unity.prefab("sharedassets149.assets", 34)
fleurs["SPRITE_GRASS_BALL"] = SPRITES.id(pgb, next(c["v"] for c in pgb["objects"][0]["c"] if c["type"] == "SpriteRenderer")["m_Sprite"], 1)
diff --git a/games/hollowknight/tools/text.py b/games/hollowknight/tools/text.py
index 1ed031c9..ee05702c 100644
--- a/games/hollowknight/tools/text.py
+++ b/games/hollowknight/tools/text.py
@@ -97,7 +97,8 @@ STYLES = {
# the items the message shows: (its name in the UI sheet, the Prompts sheet's prefix, tap or press, its two lines, the
# calculator's key for it)
MSGS = {"FIREBALL": ("INV_NAME_SPELL_FIREBALL1", "GET_ITEM_INTRO2", "BUTTON_DESC_TAP", "GET_FIREBALL_1", "GET_FIREBALL_2",
- "alpha")}
+ "alpha"),
+ "DASH": ("INV_NAME_DASH", "GET_ITEM_INTRO1", "BUTTON_DESC_PRESS", "GET_DASH_1", "GET_DASH_2", "shift")}
# the titles the game shows (the Titles sheet's X_MAIN, X_SUB, X_SUPER): the areas', bosses' and characters'
TITLES = ["KINGSPASS", "DIRTMOUTH", "CROSSROADS", "EGGTEMPLE", "SHAMANTEMPLE", "GREENPATH", "BIGFLY", "FALSE_KNIGHT",
diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.py
index 04f9cfb1..3cb49c35 100644
--- a/games/hollowknight/tools/vm.py
+++ b/games/hollowknight/tools/vm.py
@@ -11,7 +11,7 @@ import unity, text, state
# rooms -> the objects whose scripts run here (and all under them)
ROOMS = {
"Town": ["_NPCs/Elderbug"],
- "Fungus1_04": ["Hornet Infected Knight Encounter", "Hornet Saver"],
+ "Fungus1_04": ["Hornet Infected Knight Encounter", "Hornet Saver", "Cloak Corpse"],
"Crossroads_ShamanTemple": ["_Props/Shaman Meeting", "_Props/Shaman Trapped", "_Props/Shaman Killed Blocker",
"_Props/Knight Get Fireball", "Battle Scene/Reminder Cast"],
}
@@ -31,7 +31,7 @@ O_NONE = 0xFFFF
PD_INTS = ["MPCharge", "health", "maxHealth", "geo", "fireballLevel", "quakeLevel", "screamLevel", "shaman", "elderbug",
"permadeathMode", "nailDamage", "hornetGreenpath"]
# PlayerData bools kept elsewhere (src/vm.c)
-PD_SPECIAL = {"disablePause": 0xFFF0, "hasSpell": 0xFFF1}
+PD_SPECIAL = {"disablePause": 0xFFF0, "hasSpell": 0xFFF1, "canDash": 0xFFF2}
# PlayerData bools that keep their new game value all through this part of the game
PD_CONST = {"equippedCharm_10": False, "elderbugGaveFlower": False, "elderbugRequestedFlower": False,
"xunFlowerBroken": False, "hasXunFlower": False, "openedBlackEggDoor": False,
@@ -43,7 +43,8 @@ PD_CONST = {"equippedCharm_10": False, "elderbugGaveFlower": False, "elderbugReq
"elderbugSpeechJiji": False, "elderbugSpeechKingsPass": False, "elderbugSpeechMinesLift": False,
"elderbugSpeechInfectedCrossroads": False, "elderbugSpeechFinalBossDoor": False, "hasDoubleJump": False,
"hasSuperDash": False, "hasWalljump": False, "mageLordDefeated": False, "elderbugConvoGrimm": False,
- "elderbugNymmConvo": False, "elderbugTroupeLeftConvo": False, "elderbugBrettaLeft": False}
+ "elderbugNymmConvo": False, "elderbugTroupeLeftConvo": False, "elderbugBrettaLeft": False,
+ "hasAcidArmour": False}
class Strings:
@@ -158,8 +159,8 @@ op("ListenForCast", ("wasPressed", "e"))
op("CheckTrackTriggerCount", ("count", "i"), ("test", "n"), ("successEvent", "e"), ("everyFrame", "n"))
op("ShowPromptMarker", ("labelName", "s"), ("spawnPoint", "o"), ("storeObject", "O"))
op("HidePromptMarker", ("storedObject", "o"))
-op("SetFsmBool", ("gameObject", "o"), ("fsmName", "s"), ("variableName", "s"), ("setValue", "b"))
-op("SetFsmString", ("gameObject", "o"), ("fsmName", "s"), ("variableName", "s"), ("setValue", "s"))
+op("SetFsmBool", ("gameObject", "o"), ("fsmName", "s"), ("variableName", "s"), ("setValue", "b"), ("slot", "n"))
+op("SetFsmString", ("gameObject", "o"), ("fsmName", "s"), ("variableName", "s"), ("setValue", "s"), ("slot", "n"))
op("StartConversation", ("text", "x"))
op("HeroCall", ("method", "n"), ("store", "B"), ("a", "f"))
op("Shake", ("kind", "n"))
@@ -182,7 +183,9 @@ op("iTweenMoveBy", ("gameObject", "o"), ("vector", "v3"), ("time", "f"), ("easeT
HERO_METHODS = ["RelinquishControl", "RegainControl", "StopAnimationControl", "StartAnimationControl", "FaceLeft",
"FaceRight", "CanTalk", "PreventCastByDialogueEnd", "SetBackOnGround", "AddMPCharge",
"FindGroundPoint", "SetBenchRespawn", "SetHazardRespawn", "RelinquishControlNotVelocity",
- "SetCState", "SaveGame", "AffectedByGravity", "ResetHardLandingTimer", "StopPlayingAudio"]
+ "SetCState", "SaveGame", "AffectedByGravity", "ResetHardLandingTimer", "StopPlayingAudio", "CanInspect"]
+# the prompt marker the pool gives (Arrow Prompt New): a script's own, shown and hidden as ShowPromptMarker's
+PROMPT_PREFAB = ("resources.assets", 6142)
# prefabs CreateObject makes that the scripts go on with (made beforehand, off): (file, path id)
PREFAB_SPAWNS = {("sharedassets76.assets", 69)}
# the game's objects the scripts find by name that are not theirs (enemies): what they are to them
@@ -190,7 +193,7 @@ GAME_OBJECTS = {"Hornet Boss 1": 0xFF0C}
# what a trigger's Trigger2dEvent hears, by collideTag: the Knight (any), a spell
TRIGGER_TAGS = {None: 0, "": 0, "Player": 0, "Untagged": 0, "Hero Spell": 1}
# the items the message shows (text.MSGS's order), by Msg Control's Item
-MSG_ITEMS = {"Fireball": 0}
+MSG_ITEMS = {"Fireball": 0, "Dash": 1}
# camera shake events
SHAKES = {"EnemyKillShake": 1, "AverageShake": 2, "BigShake": 3, "SmallShake": 4}
@@ -227,6 +230,18 @@ class Room:
self.problems = []
# ------------------------------------------------------------ objects
+ def external_vars(self):
+ """the variables FSMs set in other FSMs (SetFsmBool, PersistentBoolItem's Activated)"""
+ if not hasattr(self, "_ext"):
+ self._ext = {"Activated"}
+ for o in list(self.by_id.values()):
+ for c in o["c"]:
+ for st in (c.get("fsm") or {}).get("states", []):
+ for a in st["actions"]:
+ if a["name"].startswith("SetFsm"):
+ self._ext.add(dict(a["params"]).get("variableName"))
+ return self._ext
+
def want(self, o):
cls = {c.get("class") or c["type"] for c in o["c"]}
return not (cls & SKIP_CLASSES) and o["name"] not in SKIP_NAMES
@@ -320,6 +335,30 @@ class Compiler:
self.consts = []
self.states = {s["name"]: i for i, s in enumerate(f["states"])}
self.where = ""
+ # (a prompt marker it spawns from the pool, Arrow Prompt New: its spawn point, where it keeps it, its label)
+ self.prompt = None
+ for st in f["states"]:
+ for a in st["actions"]:
+ P = dict(a["params"])
+ if a["name"] == "SpawnObjectFromGlobalPool" and P.get("storeObject"):
+ import ents
+ r = P.get("gameObject")
+ if isinstance(r, (list, tuple)) and ents._ref_file(o.get("_doc") or rm.d, [r[1], r[2]]) == PROMPT_PREFAB:
+ self.prompt = [P.get("spawnPoint"), P.get("storeObject"), None]
+ for st in f["states"] if self.prompt else []:
+ for a in st["actions"]:
+ P = dict(a["params"])
+ if a["name"] == "SetFsmString" and P.get("gameObject") == self.prompt[1] and P.get("variableName") == "Prompt Name":
+ self.prompt[2] = P.get("setValue")
+
+ def fsm_slot(self, fsm_name, var):
+ """another FSM's variable, by its FSM's name and its own (one of the room's): its slot, 255 not known"""
+ for o in list(self.rm.by_id.values()):
+ for c in o["c"]:
+ q = c.get("fsm")
+ if q and q["name"] == fsm_name and var in q["vars"]:
+ return _slots(q["vars"])[0][var][0]
+ return 255
def problem(self, msg):
self.rm.problems.append("%s: %s: %s: %s: %s" % (self.rm.name, self.o["path"], self.f["name"], self.where, msg))
@@ -378,6 +417,11 @@ class Compiler:
return EVENTS.id(v[1])
if isinstance(v, str) and not v.startswith("$"):
return EVENTS.id(v)
+ if isinstance(v, str) and v[1:] in self.f["vars"] and self.f["vars"][v[1:]][0] == "string" and \
+ v[1:] not in self.rm.external_vars():
+ # (an event named by a string nothing changes: that one, or none)
+ name = self.f["vars"][v[1:]][1]
+ return EVENTS.id(name) if name else 255
self.problem("event %r" % (v,))
return 255
@@ -475,11 +519,17 @@ class Compiler:
return self.emit(n, P)
if n == "CreateUIMsgGetItem":
return None # (made by the SetFsmString of its Item that follows)
+ if n == "SetFsmString" and self.prompt and P.get("gameObject") == self.prompt[1]:
+ return None # (its prompt's label: kept for UP)
+ if n == "SpawnObjectFromGlobalPool" and self.prompt and P.get("storeObject") == self.prompt[1]:
+ return None
if n == "SetFsmString" and P.get("fsmName") == "Msg Control" and P.get("variableName") == "Item":
if P.get("setValue") not in MSG_ITEMS:
self.problem("item message %s" % P.get("setValue"))
return None
return self.emit("GetItemMsg", {"item": MSG_ITEMS[P.get("setValue")]})
+ if n == "SetFsmString":
+ return self.emit(n, dict(P, slot=self.fsm_slot(P.get("fsmName"), P.get("variableName"))))
if n == "EaseColor":
cv = P.get("colorVariable")
if not (isinstance(cv, str) and cv[1:] in self.slots):
@@ -537,6 +587,8 @@ class Compiler:
if beh == "DialogueBox" and m == "StartConversation":
key, sheet = args[0]["s"], args[1]["s"]
return self.emit("StartConversation", {"text": self.rm.texts.id(sheet, key)})
+ if beh == "GameManager" and m == "CheckCharmAchievements":
+ return None
if beh == "HeroController" and m in HERO_METHODS:
a0 = args[0]["f"] if args and args[0].get("type") in (5, 0) else 0
return self.emit("HeroCall", {"method": HERO_METHODS.index(m), "store": P.get("storeResult"), "a": a0})
@@ -548,7 +600,8 @@ class Compiler:
v = (P.get("functionCall") or {}).get("value")
return self.emit("HeroCall", {"method": HERO_METHODS.index(fn), "store": None,
"a": float(v) if isinstance(v, (int, float)) and not isinstance(v, bool) else 0})
- if fn in ("advanceTypewriter", "TimePasses", "StoryRecord_acquired", "SetActionString", "RefreshButtonIcon"):
+ if fn in ("advanceTypewriter", "TimePasses", "StoryRecord_acquired", "SetActionString", "RefreshButtonIcon",
+ "StopBounce"):
return None
self.problem("SendMessage %s" % fn)
return None
@@ -565,6 +618,12 @@ class Compiler:
return None # (music)
if go in ("$DialogueManager",) and evn in ("BOX UP", "BOX DOWN"):
return self.emit("SendEventByName", P)
+ if self.prompt and go == self.prompt[1] and evn in ("UP", "DOWN"):
+ # (a prompt marker it spawned: shown at its spawn point with its label, or hidden)
+ if evn == "UP":
+ return self.emit("ShowPromptMarker", {"labelName": self.prompt[2], "spawnPoint": self.prompt[0],
+ "storeObject": go})
+ return self.emit("HidePromptMarker", {"storedObject": go})
return self.emit("SendEventByName" if n == "SendEventByName" else "SendEvent", P)
if n == "SetFsmBool":
go = P.get("gameObject")
@@ -573,7 +632,7 @@ class Compiler:
return self.emit("SetRumble", {"kind": k, "on": P.get("setValue")}) if k else None
if go == "$DialogueText":
return None # (Use Stop)
- return self.emit(n, P)
+ return self.emit(n, dict(P, slot=self.fsm_slot(P.get("fsmName"), P.get("variableName"))))
if n == "iTweenMoveBy":
if P.get("gameObject") == "$Main Camera Obj" or P.get("gameObject") == "$MainCamera":
vec = P.get("vector") or [0, 0, 0]
@@ -607,11 +666,16 @@ class Compiler:
"""-> the definition's bytes (states, actions, constants), its variables' initial values"""
f = self.f
states = []
- live = reachable(f)
+ live = reachable(f, self.rm.external_vars())
for s in f["states"]:
self.where = s["name"]
acts = []
- for a in s["actions"]:
+ cut = len(s["actions"])
+ if s["name"] in live:
+ # (an event sent for sure, and taken: what follows never runs)
+ _, sure, at = _events_of_state(f, s, _const_vars(f, self.rm.external_vars()), True)
+ cut = at + 1 if sure else cut
+ for a in s["actions"][:cut]:
if not a.get("enabled", True) or s["name"] not in live:
continue
b = self.action(a)
@@ -665,6 +729,7 @@ class Compiler:
DEFS, DEF_INDEX = [], {} # (definitions: shared)
BUILT = {} # room -> Room
LIBS = {} # (an animator's library: (file, pid)) -> actor name
+ANIMATORS = {} # (a Unity Animator's controller: (file, pid)) -> (actor, its clip's name)
TITLE_STRINGS = {}
@@ -705,6 +770,21 @@ def prepare(rooms, sprites, texts):
assert len(rm.objs) <= MAX_OBJS and len(rm.fsms) <= MAX_FSMS and nvars <= MAX_VARS, \
(name, len(rm.objs), len(rm.fsms), nvars)
BUILT[name] = rm
+ # Unity Animators (a sprite swapped each frame): their clips as actors'
+ for rm in BUILT.values():
+ for o in rm.objs:
+ ua = _unity_animator(o)
+ if not ua:
+ continue
+ import ents
+ key = ents._ref_file(o.get("_doc") or rm.d, ua["m_Controller"])
+ if key not in ANIMATORS:
+ name, fps, loops, frames = actors.animator_clip(*key)
+ m = np.array(o["m3"]).reshape(3, 3)
+ k = float(max(np.hypot(m[0, 0], m[1, 0]), np.hypot(m[0, 1], m[1, 1])))
+ a = "anim%d" % len(ANIMATORS)
+ actors.ANIMATOR_ACTORS[a] = [(name, fps, loops, frames, k)]
+ ANIMATORS[key] = (a, name)
# the animators' libraries: actors with the clips the scripts name (and their first)
names = set(STR.list)
known = {(v[0], v[1]): k for k, v in actors.ACTORS.items()}
@@ -733,10 +813,17 @@ def prepare(rooms, sprites, texts):
known[lib] = a
+def _unity_animator(o):
+ """its Unity Animator (with a SpriteRenderer it swaps the sprite of), or None"""
+ if not any(c["type"] == "SpriteRenderer" for c in o["c"]):
+ return None
+ return next((c.get("v") for c in o["c"] if c["type"] == "Animator" and c.get("v") and c["v"].get("m_Controller")), None)
+
+
OBJ = "<fffffffffHHHHHBBHHhHBBH" # x y z, sx sy, its trigger (center from its place, half size), parent, name, sprite,
# first clip, clip map, its count, flags, condition, sorting layer, order, blend, its
# colliders (first, count)
-OF_ACTIVE, OF_RENDERER, OF_ANIMATOR, OF_TRIGGER, OF_COLLIDER, OF_ANIM_OFF = 1, 2, 4, 8, 16, 32
+OF_ACTIVE, OF_RENDERER, OF_ANIMATOR, OF_TRIGGER, OF_COLLIDER, OF_ANIM_OFF, OF_WAVE = 1, 2, 4, 8, 16, 32, 64
def room_blob(name, clip_index, sprites, owners=()):
@@ -769,13 +856,24 @@ def room_blob(name, clip_index, sprites, owners=()):
if any(c.get("class") == "DeactivateAfter2dtkAnimation" for c in o["c"]):
fl |= OF_ANIM_OFF # (off once its clip is over)
bx, by = ((box[0] + box[2]) / 2 - o["pos"][0], (box[1] + box[3]) / 2 - o["pos"][1]) if box else (0, 0)
+ wv = next((c.get("v") for c in o["c"] if c.get("class") == "WaveEffectControl" and c.get("v")), None)
+ if wv:
+ # (WaveEffectControl: it grows and fades as it is on; its speed, its scale)
+ fl |= OF_WAVE
+ bx, by = wv.get("accelStart", 5), wv.get("scaleMultiplier", 1) * abs(sx) / abs(o["lscale"][0] or 1)
bhx, bhy = ((box[2] - box[0]) / 2, (box[3] - box[1]) / 2) if box else (0, 0)
sprite, first, start, count = 0xFFFF, 0xFFFF, nmap, 0
an = _animator(o)
mr = next((c.get("v") for c in o["c"] if c["type"] in ("MeshRenderer", "SpriteRenderer") and isinstance(c.get("v"), dict)), None)
if mr is not None and mr.get("m_Enabled", 1):
fl |= OF_RENDERER
- if an:
+ ua = _unity_animator(o)
+ if ua:
+ # (a Unity Animator: its clip, its first)
+ fl |= OF_ANIMATOR
+ a, cn = ANIMATORS[ents._ref_file(o.get("_doc") or rm.d, ua["m_Controller"])]
+ first = clip_index[actors.clip_id(a, cn)]
+ elif an:
fl |= OF_ANIMATOR
lib = ents._ref_file(o.get("_doc") or rm.d, an["library"])
a = LIBS[lib]
@@ -878,9 +976,22 @@ def _const_bool(name):
return None
-def _events_of_state(f, s):
+def _const_vars(f, external=()):
+ """its bool variables nothing changes (none of its actions write them, no other FSM sets them): their values"""
+ written = set(external)
+ for st in f["states"]:
+ for a in st["actions"]:
+ for k, v in a["params"]:
+ if isinstance(v, str) and v.startswith("$") and (k.startswith("store") or k.endswith("Bool") and k != "boolName" or
+ (a["name"] in ("SetBoolValue", "BoolFlip") and k == "boolVariable")):
+ written.add(v[1:])
+ return {n: bool(val) for n, (t, val) in f["vars"].items() if t == "bool" and n not in written}
+
+
+def _events_of_state(f, s, consts=None, where=False):
"""the events this state's actions can send it (None: any of the transitions': unknown)"""
- known = {} # (variables whose value is known here)
+ known = dict(consts or {}) # (variables whose value is known here)
+ takes = {e for e, _ in s["transitions"]} | {e for e, _ in f["global"]}
out = set()
def ev(v):
@@ -895,7 +1006,7 @@ def _events_of_state(f, s):
n = var(v)
return known.get(n) if n else None
- for a in s["actions"]:
+ for ai, a in enumerate(s["actions"]):
if not a.get("enabled", True):
continue
P = dict(a["params"])
@@ -914,6 +1025,9 @@ def _events_of_state(f, s):
for e, want in ((ev(P.get("isTrue")), True), (ev(P.get("isFalse")), False)):
if e and (c is None or c == want):
out.add(e)
+ if c is not None and not P.get("everyFrame") and e in takes:
+ # (sent for sure, and taken: the state's actions stop there)
+ return (out, True, ai) if where else (out, True)
continue
if n == "PlayerDataBoolTrueAndFalse":
t, fl = _const_bool(P.get("trueBool")), _const_bool(P.get("falseBool"))
@@ -928,6 +1042,8 @@ def _events_of_state(f, s):
for e, want in ((ev(P.get("isTrue")), True), (ev(P.get("isFalse")), False)):
if e and (b is None or b == want):
out.add(e)
+ if b is not None and not P.get("everyFrame") and e in takes:
+ return (out, True, ai) if where else (out, True)
continue
if n == "BoolTestMulti":
vals = [bval(v) for v in P.get("boolVariables") or []]
@@ -974,11 +1090,12 @@ def _events_of_state(f, s):
out.add(q[1])
if k == "sendEvent" and isinstance(v, str):
out.add(v)
- return out
+ return (out, False, len(s["actions"])) if where else (out, False)
-def reachable(f):
- """the names of the FSM's states that can be entered"""
+def reachable(f, external=()):
+ """the names of the FSM's states that can be entered (external: the variables other FSMs set)"""
+ consts = _const_vars(f, external)
local = set()
for s in f["states"]:
for a in s["actions"]:
@@ -999,8 +1116,8 @@ def reachable(f):
continue
seen.add(n)
s = by[n]
- can = _events_of_state(f, s)
+ can, sure = _events_of_state(f, s, consts)
for e, to in s["transitions"]:
- if e in can or e not in local:
+ if e in can or (e not in local and not (sure and e == "FINISHED")):
todo.append(to)
return seen