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: tester fixes (pogo, King's Pass, Grimm Troupe, lifeblood room, loading)

Mason Chena22f52b0ad57
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.bin
index 7dce8cfd..c665237c 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 f6e0b9c4..4c7a0df8 100644
--- a/games/hollowknight/src/data.h
+++ b/games/hollowknight/src/data.h
@@ -132,541 +132,542 @@
#define CLIP_KNIGHT_SPIKE_DEATH 72
#define CLIP_KNIGHT_SPIKE_DEATH_ANTIC 73
#define CLIP_KNIGHT_STUN 74
-#define CLIP_KNIGHT_TURN 75
-#define CLIP_KNIGHT_TURNFROMBG 76
-#define CLIP_KNIGHT_TURNTOBG 77
-#define CLIP_KNIGHT_TURNTOIDLE 78
-#define CLIP_KNIGHT_UPSLASH 79
-#define CLIP_KNIGHT_UPSLASHEFFECT 80
-#define CLIP_KNIGHT_UPSLASHEFFECT_F 81
-#define CLIP_KNIGHT_WAKE 82
-#define CLIP_KNIGHT_WAKE_TO_SIT 83
-#define CLIP_KNIGHT_WAKE_UP_GROUND 84
-#define CLIP_KNIGHT_WALK 85
-#define CLIP_GEOROCK_IDLE_1 86
-#define CLIP_GEOROCK_GLEAM_1 87
-#define CLIP_GEOROCK_BROKEN_1 88
-#define CLIP_GEOROCK_IDLE_2 89
-#define CLIP_GEOROCK_GLEAM_2 90
-#define CLIP_GEOROCK_BROKEN_2 91
-#define CLIP_CHEST_IDLE 92
-#define CLIP_CHEST_OPEN 93
-#define CLIP_CHEST_BURST 94
-#define CLIP_CHEST_OPENED 95
-#define CLIP_HUD_HEALTH_EMPTY 96
-#define CLIP_HUD_HEALTH_IDLE 97
-#define CLIP_HUD_HEALTH_BREAK 98
-#define CLIP_HUD_HEALTH_REFILL 99
-#define CLIP_HUD_HEALTH_APPEAR 100
-#define CLIP_HUD_BLUE_APPEAR 101
-#define CLIP_HUD_BLUE_IDLE 102
-#define CLIP_HUD_BLUE_BREAK 103
-#define CLIP_HUD_BLUE_BREAK_FAST 104
-#define CLIP_HUD_HUD_FRAME 105
-#define CLIP_HUD_HUD_FRAME_IDLE 106
-#define CLIP_HUD_HUD_FRAME_CRACKAPPEAR 107
-#define CLIP_HUD_HUD_FRAME_CRACKED 108
-#define CLIP_HUD_COIN_APPEAR 109
-#define CLIP_HUD_COIN_IDLE 110
-#define CLIP_HUD_COIN_GET 111
-#define CLIP_HUD_SOUL_BURST 112
-#define CLIP_LIQUID_FILL 113
-#define CLIP_LIQUID_IDLE 114
-#define CLIP_LIQUID_SHRINK 115
-#define CLIP_LIQUID_DRAIN 116
-#define CLIP_GEO_SMALL_IDLE 117
-#define CLIP_GEO_SMALL_AIR 118
-#define CLIP_GEO_MED_IDLE 119
-#define CLIP_GEO_MED_AIR 120
-#define CLIP_GEO_LARGE_IDLE 121
-#define CLIP_GEO_LARGE_AIR 122
-#define CLIP_SHOPUI_SHOP_MENU_TOP_UP 123
-#define CLIP_SHOPUI_SHOP_MENU_TOP_DOWN 124
-#define CLIP_SHOPUI_SHOP_MENU_BOTTOM_UP 125
-#define CLIP_SHOPUI_SHOP_MENU_BOTTOM_DOWN 126
-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_UP 127
-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_DOWN 128
-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_UP 129
-#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_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_STAGUI_STAG_MAP_SELECTION_CURSOR 151
-#define CLIP_STAGUI_STAG_BORDER_TOP_UP 152
-#define CLIP_STAGUI_STAG_BORDER_TOP_DOWN 153
-#define CLIP_STAGUI_STAG_BORDER_BOTTOM_UP 154
-#define CLIP_STAGUI_STAG_BORDER_BOTTOM_DOWN 155
-#define CLIP_MAPUI_IDLE 156
-#define CLIP_MAPUI_WALK 157
-#define CLIP_JOURNALMSG_MAP_WRITING 158
-#define CLIP_JOURNALMSG_MAP_COMPLETE 159
-#define CLIP_GEOBUG_LAMP_BUG_IDLE 160
-#define CLIP_DIALOGUE_ARROW_UP 161
-#define CLIP_DIALOGUE_ARROW_DOWN 162
-#define CLIP_DIALOGUE_STOP_UP 163
-#define CLIP_DIALOGUE_STOP_DOWN 164
-#define CLIP_DIALOGUE_FLEUR_TOP_UP 165
-#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 166
-#define CLIP_DIALOGUE_FLEUR_BOT_UP 167
-#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 168
-#define CLIP_DIALOGUE_DREAM_UP 169
-#define CLIP_DIALOGUE_DREAM_DOWN 170
-#define CLIP_PROMPT_BLANK 171
-#define CLIP_PROMPT_DOWN 172
-#define CLIP_PROMPT_ENTER_DOWN 173
-#define CLIP_PROMPT_ENTER_IDLE 174
-#define CLIP_PROMPT_ENTER_UP 175
-#define CLIP_PROMPT_IDLE 176
-#define CLIP_PROMPT_LISTEN_DOWN 177
-#define CLIP_PROMPT_LISTEN_IDLE 178
-#define CLIP_PROMPT_LISTEN_UP 179
-#define CLIP_PROMPT_UP 180
-#define CLIP_SHADE_APPEAR 181
-#define CLIP_SHADE_CAST 182
-#define CLIP_SHADE_CAST_ANTIC 183
-#define CLIP_SHADE_CAST_CHARGE 184
-#define CLIP_SHADE_CAST_RING 185
-#define CLIP_SHADE_DEATH 186
-#define CLIP_SHADE_DEATH_GLOW 187
-#define CLIP_SHADE_DEATH_START 188
-#define CLIP_SHADE_DEPART 189
-#define CLIP_SHADE_FIREBALL 190
-#define CLIP_SHADE_FIREBALL_END 191
-#define CLIP_SHADE_FLY 192
-#define CLIP_SHADE_IDLE 193
-#define CLIP_SHADE_RETREAT_END 194
-#define CLIP_SHADE_RETREAT_START 195
-#define CLIP_SHADE_SLASH 196
-#define CLIP_SHADE_SLASH_ANTIC 197
-#define CLIP_SHADE_SLASH_CD 198
-#define CLIP_SHADE_SLASH_EFFECT 199
-#define CLIP_SHADE_STARTLE 200
-#define CLIP_SHADE_TURNTOFLY 201
-#define CLIP_SHADE_TURNTOIDLE 202
-#define CLIP_CRAWLER_WALK 203
-#define CLIP_CRAWLER_TURN 204
-#define CLIP_CRAWLER_IDLE 205
-#define CLIP_CRAWLER_DEATH_AIR 206
-#define CLIP_CRAWLER_DEATH_LAND 207
-#define CLIP_BUZZER_CHASE 208
-#define CLIP_BUZZER_IDLE 209
-#define CLIP_BUZZER_STARTLE 210
-#define CLIP_BUZZER_DEATH_AIR 211
-#define CLIP_BUZZER_DEATH_LAND 212
-#define CLIP_BUZZER_FLY 213
-#define CLIP_BUZZER_TURNTOFLY 214
-#define CLIP_BUZZER_TURNTOIDLE 215
-#define CLIP_TIKTIK_DEATH_AIR 216
-#define CLIP_TIKTIK_DEATH_LAND 217
-#define CLIP_TIKTIK_STUN 218
-#define CLIP_TIKTIK_WALK 219
-#define CLIP_GRUZZER_DEATH_AIR 220
-#define CLIP_GRUZZER_DEATH_LAND 221
-#define CLIP_GRUZZER_FLY 222
-#define CLIP_ASPID_DEATH_AIR 223
-#define CLIP_ASPID_FIRE_LONG 224
-#define CLIP_ASPID_FLY 225
-#define CLIP_ASPID_TURNTOFLY 226
-#define CLIP_BALDUR_DEATH_AIR 227
-#define CLIP_BALDUR_DEATH_LAND 228
-#define CLIP_BALDUR_IDLE 229
-#define CLIP_BALDUR_ROLL 230
-#define CLIP_BALDUR_START 231
-#define CLIP_BALDUR_STOP 232
-#define CLIP_ELDERBALDUR_CLOSE1 233
-#define CLIP_ELDERBALDUR_CLOSE2 234
-#define CLIP_ELDERBALDUR_CLOSED 235
-#define CLIP_ELDERBALDUR_DEATH 236
-#define CLIP_ELDERBALDUR_DEATH_STUN 237
-#define CLIP_ELDERBALDUR_HIT 238
-#define CLIP_ELDERBALDUR_IDLE 239
-#define CLIP_ELDERBALDUR_OPEN 240
-#define CLIP_ELDERBALDUR_SHOOT_ANTIC 241
-#define CLIP_ELDERBALDUR_SHOOT_CD 242
-#define CLIP_HUSK_ATTACK_ANTICIPATE 243
-#define CLIP_HUSK_ATTACK_COOLDOWN 244
-#define CLIP_HUSK_ATTACK_LUNGE 245
-#define CLIP_HUSK_DEATH_AIR 246
-#define CLIP_HUSK_DEATH_LAND 247
-#define CLIP_HUSK_IDLE 248
-#define CLIP_HUSK_TURN 249
-#define CLIP_HUSK_WALK 250
-#define CLIP_BARGER_ATTACK_ANTICIPATE 251
-#define CLIP_BARGER_ATTACK_COOLDOWN 252
-#define CLIP_BARGER_ATTACK_LUNGE 253
-#define CLIP_BARGER_DEATH_AIR 254
-#define CLIP_BARGER_DEATH_LAND 255
-#define CLIP_BARGER_IDLE 256
-#define CLIP_BARGER_TURN 257
-#define CLIP_BARGER_WALK 258
-#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 259
-#define CLIP_HORNHEAD_ATTACK_COOLDOWN 260
-#define CLIP_HORNHEAD_ATTACK_LUNGE 261
-#define CLIP_HORNHEAD_DEATH_AIR 262
-#define CLIP_HORNHEAD_DEATH_LAND 263
-#define CLIP_HORNHEAD_IDLE 264
-#define CLIP_HORNHEAD_TURN 265
-#define CLIP_HORNHEAD_WALK 266
-#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 267
-#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 268
-#define CLIP_MOSSRUNNER_ATTACK_LUNGE 269
-#define CLIP_MOSSRUNNER_DEATH_AIR 270
-#define CLIP_MOSSRUNNER_DEATH_LAND 271
-#define CLIP_MOSSRUNNER_IDLE 272
-#define CLIP_MOSSRUNNER_TURN 273
-#define CLIP_MOSSRUNNER_WALK 274
-#define CLIP_LEAPER_ATTACK 275
-#define CLIP_LEAPER_DEATH_AIR 276
-#define CLIP_LEAPER_DEATH_LAND 277
-#define CLIP_LEAPER_IDLE 278
-#define CLIP_LEAPER_LAND 279
-#define CLIP_LEAPER_TURN 280
-#define CLIP_LEAPER_WALK 281
-#define CLIP_GUARD_ANTICIPATE 282
-#define CLIP_GUARD_ATTACK2 283
-#define CLIP_GUARD_DEATH_AIR 284
-#define CLIP_GUARD_DEATH_LAND 285
-#define CLIP_GUARD_DORMANT 286
-#define CLIP_GUARD_IDLE 287
-#define CLIP_GUARD_RUN 288
-#define CLIP_GUARD_STARTLE 289
-#define CLIP_GUARD_STOMP_ANTIC 290
-#define CLIP_GUARD_STOMP_JUMP 291
-#define CLIP_GUARD_STOMP_LAND 292
-#define CLIP_GUARD_STOP_RUN 293
-#define CLIP_GUARD_STOP_WALK 294
-#define CLIP_GUARD_SWIPE 295
-#define CLIP_GUARD_TURN 296
-#define CLIP_GUARD_WAKE 297
-#define CLIP_GUARD_WALK 298
-#define CLIP_FK_ATTACK 299
-#define CLIP_FK_ATTACK_ANTIC 300
-#define CLIP_FK_ATTACK_RECOVER 301
-#define CLIP_FK_BLANK 302
-#define CLIP_FK_BODY 303
-#define CLIP_FK_DEATH_FALL 304
-#define CLIP_FK_DEATH_HEAD_1 305
-#define CLIP_FK_DEATH_HEAD_2 306
-#define CLIP_FK_DEATH_LAND 307
-#define CLIP_FK_DEATH_SPAZ 308
-#define CLIP_FK_IDLE 309
-#define CLIP_FK_JUMP 310
-#define CLIP_FK_JUMP_ANTIC 311
-#define CLIP_FK_JUMP_ATTACK_HIT_1 312
-#define CLIP_FK_JUMP_ATTACK_HIT_2 313
-#define CLIP_FK_JUMP_ATTACK_HIT_3 314
-#define CLIP_FK_JUMP_ATTACK_UP 315
-#define CLIP_FK_LAND 316
-#define CLIP_FK_RAGE 317
-#define CLIP_FK_RUN 318
-#define CLIP_FK_RUN_ANTIC 319
-#define CLIP_FK_STUN_HIT 320
-#define CLIP_FK_STUN_OPEN 321
-#define CLIP_FK_STUN_OPENED 322
-#define CLIP_FK_STUN_RECOVER 323
-#define CLIP_FK_STUN_ROLL 324
-#define CLIP_FK_STUN_ROLL_END 325
-#define CLIP_FK_TURN 326
-#define CLIP_FKHEAD_DEATH_LAND 327
-#define CLIP_FKHEAD_HEAD_HIT 328
-#define CLIP_FKHEAD_HEAD_IDLE 329
-#define CLIP_FKHEAD_HEAD_SPAZ 330
-#define CLIP_HATCHER_DEATH_AIR 331
-#define CLIP_HATCHER_DEATH_LAND 332
-#define CLIP_HATCHER_FIRE 333
-#define CLIP_HATCHER_FLY 334
-#define CLIP_HATCHLING_FLY 335
-#define CLIP_SLUG_BOUNCE 336
-#define CLIP_SLUG_DEATH_AIR 337
-#define CLIP_SLUG_DEATH_LAND 338
-#define CLIP_SLUG_IDLE_TODOWN 339
-#define CLIP_SLUG_IDLE_TOUP 340
-#define CLIP_SLUG_IDLE_UP 341
-#define CLIP_SLUG_RUN 342
-#define CLIP_SLUG_STARTLE 343
-#define CLIP_GFLY_BURST 344
-#define CLIP_GFLY_CHARGE 345
-#define CLIP_GFLY_CHARGE_ANTIC 346
-#define CLIP_GFLY_CHARGE_RECOVER 347
-#define CLIP_GFLY_DEATH 348
-#define CLIP_GFLY_FALL 349
-#define CLIP_GFLY_FLY 350
-#define CLIP_GFLY_GURGLE_LOOP 351
-#define CLIP_GFLY_GURGLE_ONCE 352
-#define CLIP_GFLY_SLAM_DOWN 353
-#define CLIP_GFLY_SLAM_END 354
-#define CLIP_GFLY_SLAM_UP 355
-#define CLIP_GFLY_SLEEP 356
-#define CLIP_GFLY_STOP 357
-#define CLIP_GFLY_WAKE 358
-#define CLIP_GFLY_WIGGLE 359
-#define CLIP_MOSSWALKER_APPEAR 360
-#define CLIP_MOSSWALKER_BURY 361
-#define CLIP_MOSSWALKER_DEATH_AIR 362
-#define CLIP_MOSSWALKER_DEATH_LAND 363
-#define CLIP_MOSSWALKER_SHAKE 364
-#define CLIP_MOSSWALKER_TURN 365
-#define CLIP_MOSSWALKER_WALK 366
-#define CLIP_PIGEON_FLY 367
-#define CLIP_PIGEON_IDLE_01 368
-#define CLIP_PIGEON_IDLE_02 369
-#define CLIP_PIGEON_IDLE_03 370
-#define CLIP_PLANTTRAP_DEATH 371
-#define CLIP_PLANTTRAP_IDLE 372
-#define CLIP_PLANTTRAP_RETRACT 373
-#define CLIP_PLANTTRAP_SNAP 374
-#define CLIP_PLANTTRAP_SNAP_READY 375
-#define CLIP_SHAKER_ATTACK 376
-#define CLIP_SHAKER_DEATH_AIR 377
-#define CLIP_SHAKER_DEATH_LAND 378
-#define CLIP_SHAKER_IDLE 379
-#define CLIP_SHAKER_TURN 380
-#define CLIP_SHAKER_WALK 381
-#define CLIP_MOSQUITO_ATTACK 382
-#define CLIP_MOSQUITO_ATTACK_ANTIC 383
-#define CLIP_MOSQUITO_DEATH_AIR 384
-#define CLIP_MOSQUITO_DEATH_LAND 385
-#define CLIP_MOSQUITO_IDLE 386
-#define CLIP_MOSQUITO_STARTLE 387
-#define CLIP_MOSQUITO_TURNTOIDLE 388
-#define CLIP_FATFLY_ATTACK 389
-#define CLIP_FATFLY_DEATH_AIR 390
-#define CLIP_FATFLY_DEATH_LAND 391
-#define CLIP_FATFLY_FLY 392
-#define CLIP_MOSSCHARGER_APPEAR 393
-#define CLIP_MOSSCHARGER_CHARGE 394
-#define CLIP_MOSSCHARGER_DEATH_AIR 395
-#define CLIP_MOSSCHARGER_DEATH_LAND 396
-#define CLIP_MOSSCHARGER_DISAPPEAR 397
-#define CLIP_MOSSCHARGER_ESCAPE 398
-#define CLIP_MOSSCHARGER_GET_UP 399
-#define CLIP_MOSSCHARGER_STUN 400
-#define CLIP_MOSSCHARGER_TURNRUN 401
-#define CLIP_MOSSKNIGHT_DEATH_AIR 402
-#define CLIP_MOSSKNIGHT_DEATH_LAND 403
-#define CLIP_MOSSKNIGHT_DORMANT_1 404
-#define CLIP_MOSSKNIGHT_DORMANT_2 405
-#define CLIP_MOSSKNIGHT_EVADE 406
-#define CLIP_MOSSKNIGHT_IDLE 407
-#define CLIP_MOSSKNIGHT_SHAKE 408
-#define CLIP_MOSSKNIGHT_SHIELD_FRONT 409
-#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 410
-#define CLIP_MOSSKNIGHT_SHIELD_TOP 411
-#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 412
-#define CLIP_MOSSKNIGHT_SHOOT 413
-#define CLIP_MOSSKNIGHT_SHOOT_END 414
-#define CLIP_MOSSKNIGHT_SLASH 415
-#define CLIP_MOSSKNIGHT_SLASH_2 416
-#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 417
-#define CLIP_MOSSKNIGHT_SLASH_EFFECT 418
-#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 419
-#define CLIP_MOSSKNIGHT_SLASH_END 420
-#define CLIP_MOSSKNIGHT_SLASH_QUICK 421
-#define CLIP_MOSSKNIGHT_TURN 422
-#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 423
-#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 424
-#define CLIP_MOSSKNIGHT_WAKE 425
-#define CLIP_MOSSKNIGHT_WALK 426
-#define CLIP_HORNET_A_DASH 427
-#define CLIP_HORNET_A_DASH_ANTIC 428
-#define CLIP_HORNET_AIR_DASH_EFFECT 429
-#define CLIP_HORNET_DEATH_AIR 430
-#define CLIP_HORNET_EVADE 431
-#define CLIP_HORNET_EVADE_ANTIC 432
-#define CLIP_HORNET_FALL 433
-#define CLIP_HORNET_FLASH 434
-#define CLIP_HORNET_FLOURISH 435
-#define CLIP_HORNET_G_DASH 436
-#define CLIP_HORNET_G_DASH_ANTIC 437
-#define CLIP_HORNET_G_DASH_EFFECT 438
-#define CLIP_HORNET_G_DASH_RECOVER1 439
-#define CLIP_HORNET_G_DASH_RECOVER2 440
-#define CLIP_HORNET_HARD_LAND 441
-#define CLIP_HORNET_IDLE 442
-#define CLIP_HORNET_JUMP 443
-#define CLIP_HORNET_JUMP_ANTIC 444
-#define CLIP_HORNET_LAND 445
-#define CLIP_HORNET_NEEDLE 446
-#define CLIP_HORNET_NEEDLE_THREAD 447
-#define CLIP_HORNET_RUN 448
-#define CLIP_HORNET_SPHERE_ANTIC_A 449
-#define CLIP_HORNET_SPHERE_ANTIC_G 450
-#define CLIP_HORNET_SPHERE_ATTACK 451
-#define CLIP_HORNET_SPHERE_BALL 452
-#define CLIP_HORNET_SPHERE_RECOVER_A 453
-#define CLIP_HORNET_SPHERE_RECOVER_G 454
-#define CLIP_HORNET_STUN 455
-#define CLIP_HORNET_STUN_AIR 456
-#define CLIP_HORNET_THROW 457
-#define CLIP_HORNET_THROW_ANTIC 458
-#define CLIP_HORNET_THROW_EFFECT 459
-#define CLIP_HORNET_THROW_RECOVER 460
-#define CLIP_HORNET_WALL_IMPACT 461
-#define CLIP_HORNET_WOUNDED 462
-#define CLIP_MENDER_DEATH_AIR 463
-#define CLIP_MENDER_DEATH_LAND 464
-#define CLIP_MENDER_FLY 465
-#define CLIP_MENDER_IDLE 466
-#define CLIP_MENDER_STARTLE 467
-#define CLIP_BGATE_BG_CLOSE_1 468
-#define CLIP_BGATE_BG_CLOSE_2 469
-#define CLIP_BGATE_BG_CLOSED 470
-#define CLIP_BGATE_BG_OPEN 471
-#define CLIP_BGATE_BG_OPENED 472
-#define CLIP_BGATE_BONE_GATE_CLOSE 473
-#define CLIP_BGATE_BONE_GATE_CLOSED 474
-#define CLIP_BGATE_BONE_GATE_OPEN 475
-#define CLIP_BGATE_BONE_GATE_OPENED 476
-#define CLIP_BGATE_GATE_IDLE 477
-#define CLIP_BGATE_GATE_OPEN 478
-#define CLIP_BGATE_GATE_OPENED 479
-#define CLIP_BGATE_PILLAR_IDLE 480
-#define CLIP_BGATE_PILLAR_OPENED 481
-#define CLIP_BGATE_SWITCH_ACTIVATED 482
-#define CLIP_BGATE_SWITCH_HIT 483
-#define CLIP_BGATE_SWITCH_IDLE 484
-#define CLIP_BGATE_TOLL_GATE_IDLE 485
-#define CLIP_BGATE_TOLL_GATE_OPEN 486
-#define CLIP_COCOON_COCOON_IDLE 487
-#define CLIP_COCOON_COCOON_SWEAT 488
-#define CLIP_COCOON_SCUTTLER_LAND 489
-#define CLIP_COCOON_SCUTTLER_RUN 490
-#define CLIP_FX_SPLAT 491
-#define CLIP_FX_SPLAT2 492
-#define CLIP_FX_SWORD 493
-#define CLIP_FIREBALL_BLAST 494
-#define CLIP_FIREBALL_BALL 495
-#define CLIP_FIREBALL_BALL_END 496
-#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 497
-#define CLIP_DRIP_IDLE 498
-#define CLIP_DRIP_DRIP 499
-#define CLIP_DRIP_FALL 500
-#define CLIP_DRIP_IMPACT 501
-#define CLIP_HORNETCS_EVADE 502
-#define CLIP_HORNETCS_EVADE_ANTIC 503
-#define CLIP_HORNETCS_FALL 504
-#define CLIP_HORNETCS_HARPOON_SIDE 505
-#define CLIP_HORNETCS_IDLE 506
-#define CLIP_HORNETCS_JUMP_FULL 507
-#define CLIP_HORNETCS_POINT 508
-#define CLIP_HORNETCS_RUN 509
-#define CLIP_HORNETCS_SOFT_LAND 510
-#define CLIP_HORNETCS_THREAD_1 511
-#define CLIP_HORNETCS_THROW_SIDE 512
-#define CLIP_HORNETCS_THROW_SIDE_START 513
-#define CLIP_HORNETCS_TURN 514
-#define CLIP_HORNETCS_TURNTOIDLE 515
-#define CLIP_BULLET_IDLE 516
-#define CLIP_BULLET_IMPACT 517
-#define CLIP_BULLET_SHOCKWAVE_SPURT 518
-#define CLIP_PROP0_WATERFALL_LOOP 519
-#define CLIP_PROP1_TORCH2 520
-#define CLIP_PROP1_TORCH3 521
-#define CLIP_VM0_FLOWER 522
-#define CLIP_VM0_IDLE 523
-#define CLIP_VM0_REACH 524
-#define CLIP_VM0_REACH_TO_IDLE 525
-#define CLIP_VM0_TALK_LEFT 526
-#define CLIP_VM0_TALK_RIGHT 527
-#define CLIP_VM0_TURN_LEFT 528
-#define CLIP_VM0_TURN_RIGHT 529
-#define CLIP_VM2_IDLE 530
-#define CLIP_VM2_LOOKLEFT 531
-#define CLIP_VM2_LOOKRIGHT 532
-#define CLIP_VM3_IDLE 533
-#define CLIP_VM3_TALK 534
-#define CLIP_VM3_TALK_END 535
-#define CLIP_VM4_IDLE 536
-#define CLIP_VM4_LOOKLEFT 537
-#define CLIP_VM4_LOOKRIGHT 538
-#define CLIP_VM4_SIT 539
-#define CLIP_VM4_SIT_TALK 540
-#define CLIP_VM4_SIT_TALK_END 541
-#define CLIP_VM5_ARRIVE 542
-#define CLIP_VM5_ARRIVE_SMOKE 543
-#define CLIP_VM5_IDLE 544
-#define CLIP_VM6_BELL_IDLE 545
-#define CLIP_VM6_BELL_RING_R 546
-#define CLIP_VM6_BELL_STAND 547
-#define CLIP_VM6_BELL_STAND_APPEAR 548
-#define CLIP_VM6_BOX_DISAPPEAR 549
-#define CLIP_VM6_BOX_DISAPPEAR_QUICK 550
-#define CLIP_VM6_BOX_IDLE 551
-#define CLIP_VM6_FRONT 552
-#define CLIP_VM6_GRATE_DISAPPEAR 553
-#define CLIP_VM6_GRATE_IDLE 554
-#define CLIP_VM8_DAZED 555
-#define CLIP_VM8_IDLE 556
-#define CLIP_VM8_TURN_L 557
-#define CLIP_VM8_TURN_R 558
-#define CLIP_VM8_WAKE 559
-#define CLIP_VM11_HEGEMOL_CAST 560
-#define CLIP_VM11_HEGEMOL_IDLE 561
-#define CLIP_VM11_LURIEN_CAST 562
-#define CLIP_VM11_LURIEN_IDLE 563
-#define CLIP_VM11_MONOMON_CAST 564
-#define CLIP_VM11_MONOMON_IDLE 565
-#define CLIP_VM12_IDLE 566
-#define CLIP_VM12_SIT_IDLE 567
-#define CLIP_VM12_SIT_TALK 568
-#define CLIP_VM12_SIT_TALK_END 569
-#define CLIP_VM12_SUMMON 570
-#define CLIP_VM12_TALK 571
-#define CLIP_VM12_TALK_END 572
-#define CLIP_VM12_TURN 573
-#define CLIP_VM14_IDLE 574
-#define CLIP_VM14_LOOK_LEFT 575
-#define CLIP_VM14_LOOK_RIGHT 576
-#define CLIP_VM14_TALK_CONVO_END 577
-#define CLIP_VM14_TALK_CONVO_START 578
-#define CLIP_VM14_TALK_SHOP_END 579
-#define CLIP_VM14_TALK_SHOP_START 580
-#define CLIP_VM15_IDLE 581
-#define CLIP_VM15_SHOP_END 582
-#define CLIP_VM15_SHOP_START 583
-#define CLIP_VM15_TALK_END 584
-#define CLIP_VM15_TALK_START 585
-#define CLIP_VM16_CRY 586
-#define CLIP_VM16_CRY_TURN 587
-#define CLIP_VM16_FREED 588
-#define CLIP_VM16_HOME_BOUNCE 589
-#define CLIP_VM16_HOME_WAVE 590
-#define CLIP_VM16_IDLE 591
-#define CLIP_VM17_CRUMBLE 592
-#define CLIP_VM17_IDLE 593
-#define CLIP_VM18_BECKON 594
-#define CLIP_VM18_CHEER 595
-#define CLIP_VM18_CRY 596
-#define CLIP_VM18_GIFT 597
-#define CLIP_VM18_IDLE 598
-#define CLIP_VM20_RIPPLE_WATER 599
-#define CLIP_VM21_IDLE 600
-#define CLIP_VM21_TALK_L 601
-#define CLIP_VM21_TALK_L_END 602
-#define CLIP_VM21_TALK_R 603
-#define CLIP_VM21_TALK_R_END 604
-#define CLIP_ANIM0_STAG_DOOR_OPEN00 605
-#define CLIP_ANIM1_DASH_CLOAK_CORPSE000 606
-#define CLIP_ANIM2_GROUND_PLINK_0 607
-#define CLIP_ANIM3_FIREBALL_COLLECT_ANIM 608
-#define CLIP_ANIM4_DOOR_OPEN00 609
+#define CLIP_KNIGHT_SUPER_HARD_LAND 75
+#define CLIP_KNIGHT_TURN 76
+#define CLIP_KNIGHT_TURNFROMBG 77
+#define CLIP_KNIGHT_TURNTOBG 78
+#define CLIP_KNIGHT_TURNTOIDLE 79
+#define CLIP_KNIGHT_UPSLASH 80
+#define CLIP_KNIGHT_UPSLASHEFFECT 81
+#define CLIP_KNIGHT_UPSLASHEFFECT_F 82
+#define CLIP_KNIGHT_WAKE 83
+#define CLIP_KNIGHT_WAKE_TO_SIT 84
+#define CLIP_KNIGHT_WAKE_UP_GROUND 85
+#define CLIP_KNIGHT_WALK 86
+#define CLIP_GEOROCK_IDLE_1 87
+#define CLIP_GEOROCK_GLEAM_1 88
+#define CLIP_GEOROCK_BROKEN_1 89
+#define CLIP_GEOROCK_IDLE_2 90
+#define CLIP_GEOROCK_GLEAM_2 91
+#define CLIP_GEOROCK_BROKEN_2 92
+#define CLIP_CHEST_IDLE 93
+#define CLIP_CHEST_OPEN 94
+#define CLIP_CHEST_BURST 95
+#define CLIP_CHEST_OPENED 96
+#define CLIP_HUD_HEALTH_EMPTY 97
+#define CLIP_HUD_HEALTH_IDLE 98
+#define CLIP_HUD_HEALTH_BREAK 99
+#define CLIP_HUD_HEALTH_REFILL 100
+#define CLIP_HUD_HEALTH_APPEAR 101
+#define CLIP_HUD_BLUE_APPEAR 102
+#define CLIP_HUD_BLUE_IDLE 103
+#define CLIP_HUD_BLUE_BREAK 104
+#define CLIP_HUD_BLUE_BREAK_FAST 105
+#define CLIP_HUD_HUD_FRAME 106
+#define CLIP_HUD_HUD_FRAME_IDLE 107
+#define CLIP_HUD_HUD_FRAME_CRACKAPPEAR 108
+#define CLIP_HUD_HUD_FRAME_CRACKED 109
+#define CLIP_HUD_COIN_APPEAR 110
+#define CLIP_HUD_COIN_IDLE 111
+#define CLIP_HUD_COIN_GET 112
+#define CLIP_HUD_SOUL_BURST 113
+#define CLIP_LIQUID_FILL 114
+#define CLIP_LIQUID_IDLE 115
+#define CLIP_LIQUID_SHRINK 116
+#define CLIP_LIQUID_DRAIN 117
+#define CLIP_GEO_SMALL_IDLE 118
+#define CLIP_GEO_SMALL_AIR 119
+#define CLIP_GEO_MED_IDLE 120
+#define CLIP_GEO_MED_AIR 121
+#define CLIP_GEO_LARGE_IDLE 122
+#define CLIP_GEO_LARGE_AIR 123
+#define CLIP_SHOPUI_SHOP_MENU_TOP_UP 124
+#define CLIP_SHOPUI_SHOP_MENU_TOP_DOWN 125
+#define CLIP_SHOPUI_SHOP_MENU_BOTTOM_UP 126
+#define CLIP_SHOPUI_SHOP_MENU_BOTTOM_DOWN 127
+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_UP 128
+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_DOWN 129
+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_UP 130
+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_DOWN 131
+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_UP 132
+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_DOWN 133
+#define CLIP_HEARTUI_FLEUR_APPEAR 134
+#define CLIP_HEARTUI_FLEUR_DISAPPEAR 135
+#define CLIP_HEARTUI_GET_0 136
+#define CLIP_HEARTUI_GET_1 137
+#define CLIP_HEARTUI_GET_2 138
+#define CLIP_HEARTUI_GET_3 139
+#define CLIP_HEARTUI_GET_4 140
+#define CLIP_HEARTUI_GOT_1 141
+#define CLIP_HEARTUI_GOT_2 142
+#define CLIP_HEARTUI_GOT_3 143
+#define CLIP_HEARTUI_FUSE 144
+#define CLIP_HEARTUI_HEAD_MOVE 145
+#define CLIP_VESSELUI_GET_0 146
+#define CLIP_VESSELUI_GET_1 147
+#define CLIP_VESSELUI_GET_2 148
+#define CLIP_VESSELUI_GET_3 149
+#define CLIP_VESSELUI_GOT_1 150
+#define CLIP_VESSELUI_GOT_2 151
+#define CLIP_STAGUI_STAG_MAP_SELECTION_CURSOR 152
+#define CLIP_STAGUI_STAG_BORDER_TOP_UP 153
+#define CLIP_STAGUI_STAG_BORDER_TOP_DOWN 154
+#define CLIP_STAGUI_STAG_BORDER_BOTTOM_UP 155
+#define CLIP_STAGUI_STAG_BORDER_BOTTOM_DOWN 156
+#define CLIP_MAPUI_IDLE 157
+#define CLIP_MAPUI_WALK 158
+#define CLIP_JOURNALMSG_MAP_WRITING 159
+#define CLIP_JOURNALMSG_MAP_COMPLETE 160
+#define CLIP_GEOBUG_LAMP_BUG_IDLE 161
+#define CLIP_DIALOGUE_ARROW_UP 162
+#define CLIP_DIALOGUE_ARROW_DOWN 163
+#define CLIP_DIALOGUE_STOP_UP 164
+#define CLIP_DIALOGUE_STOP_DOWN 165
+#define CLIP_DIALOGUE_FLEUR_TOP_UP 166
+#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 167
+#define CLIP_DIALOGUE_FLEUR_BOT_UP 168
+#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 169
+#define CLIP_DIALOGUE_DREAM_UP 170
+#define CLIP_DIALOGUE_DREAM_DOWN 171
+#define CLIP_PROMPT_BLANK 172
+#define CLIP_PROMPT_DOWN 173
+#define CLIP_PROMPT_ENTER_DOWN 174
+#define CLIP_PROMPT_ENTER_IDLE 175
+#define CLIP_PROMPT_ENTER_UP 176
+#define CLIP_PROMPT_IDLE 177
+#define CLIP_PROMPT_LISTEN_DOWN 178
+#define CLIP_PROMPT_LISTEN_IDLE 179
+#define CLIP_PROMPT_LISTEN_UP 180
+#define CLIP_PROMPT_UP 181
+#define CLIP_SHADE_APPEAR 182
+#define CLIP_SHADE_CAST 183
+#define CLIP_SHADE_CAST_ANTIC 184
+#define CLIP_SHADE_CAST_CHARGE 185
+#define CLIP_SHADE_CAST_RING 186
+#define CLIP_SHADE_DEATH 187
+#define CLIP_SHADE_DEATH_GLOW 188
+#define CLIP_SHADE_DEATH_START 189
+#define CLIP_SHADE_DEPART 190
+#define CLIP_SHADE_FIREBALL 191
+#define CLIP_SHADE_FIREBALL_END 192
+#define CLIP_SHADE_FLY 193
+#define CLIP_SHADE_IDLE 194
+#define CLIP_SHADE_RETREAT_END 195
+#define CLIP_SHADE_RETREAT_START 196
+#define CLIP_SHADE_SLASH 197
+#define CLIP_SHADE_SLASH_ANTIC 198
+#define CLIP_SHADE_SLASH_CD 199
+#define CLIP_SHADE_SLASH_EFFECT 200
+#define CLIP_SHADE_STARTLE 201
+#define CLIP_SHADE_TURNTOFLY 202
+#define CLIP_SHADE_TURNTOIDLE 203
+#define CLIP_CRAWLER_WALK 204
+#define CLIP_CRAWLER_TURN 205
+#define CLIP_CRAWLER_IDLE 206
+#define CLIP_CRAWLER_DEATH_AIR 207
+#define CLIP_CRAWLER_DEATH_LAND 208
+#define CLIP_BUZZER_CHASE 209
+#define CLIP_BUZZER_IDLE 210
+#define CLIP_BUZZER_STARTLE 211
+#define CLIP_BUZZER_DEATH_AIR 212
+#define CLIP_BUZZER_DEATH_LAND 213
+#define CLIP_BUZZER_FLY 214
+#define CLIP_BUZZER_TURNTOFLY 215
+#define CLIP_BUZZER_TURNTOIDLE 216
+#define CLIP_TIKTIK_DEATH_AIR 217
+#define CLIP_TIKTIK_DEATH_LAND 218
+#define CLIP_TIKTIK_STUN 219
+#define CLIP_TIKTIK_WALK 220
+#define CLIP_GRUZZER_DEATH_AIR 221
+#define CLIP_GRUZZER_DEATH_LAND 222
+#define CLIP_GRUZZER_FLY 223
+#define CLIP_ASPID_DEATH_AIR 224
+#define CLIP_ASPID_FIRE_LONG 225
+#define CLIP_ASPID_FLY 226
+#define CLIP_ASPID_TURNTOFLY 227
+#define CLIP_BALDUR_DEATH_AIR 228
+#define CLIP_BALDUR_DEATH_LAND 229
+#define CLIP_BALDUR_IDLE 230
+#define CLIP_BALDUR_ROLL 231
+#define CLIP_BALDUR_START 232
+#define CLIP_BALDUR_STOP 233
+#define CLIP_ELDERBALDUR_CLOSE1 234
+#define CLIP_ELDERBALDUR_CLOSE2 235
+#define CLIP_ELDERBALDUR_CLOSED 236
+#define CLIP_ELDERBALDUR_DEATH 237
+#define CLIP_ELDERBALDUR_DEATH_STUN 238
+#define CLIP_ELDERBALDUR_HIT 239
+#define CLIP_ELDERBALDUR_IDLE 240
+#define CLIP_ELDERBALDUR_OPEN 241
+#define CLIP_ELDERBALDUR_SHOOT_ANTIC 242
+#define CLIP_ELDERBALDUR_SHOOT_CD 243
+#define CLIP_HUSK_ATTACK_ANTICIPATE 244
+#define CLIP_HUSK_ATTACK_COOLDOWN 245
+#define CLIP_HUSK_ATTACK_LUNGE 246
+#define CLIP_HUSK_DEATH_AIR 247
+#define CLIP_HUSK_DEATH_LAND 248
+#define CLIP_HUSK_IDLE 249
+#define CLIP_HUSK_TURN 250
+#define CLIP_HUSK_WALK 251
+#define CLIP_BARGER_ATTACK_ANTICIPATE 252
+#define CLIP_BARGER_ATTACK_COOLDOWN 253
+#define CLIP_BARGER_ATTACK_LUNGE 254
+#define CLIP_BARGER_DEATH_AIR 255
+#define CLIP_BARGER_DEATH_LAND 256
+#define CLIP_BARGER_IDLE 257
+#define CLIP_BARGER_TURN 258
+#define CLIP_BARGER_WALK 259
+#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 260
+#define CLIP_HORNHEAD_ATTACK_COOLDOWN 261
+#define CLIP_HORNHEAD_ATTACK_LUNGE 262
+#define CLIP_HORNHEAD_DEATH_AIR 263
+#define CLIP_HORNHEAD_DEATH_LAND 264
+#define CLIP_HORNHEAD_IDLE 265
+#define CLIP_HORNHEAD_TURN 266
+#define CLIP_HORNHEAD_WALK 267
+#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 268
+#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 269
+#define CLIP_MOSSRUNNER_ATTACK_LUNGE 270
+#define CLIP_MOSSRUNNER_DEATH_AIR 271
+#define CLIP_MOSSRUNNER_DEATH_LAND 272
+#define CLIP_MOSSRUNNER_IDLE 273
+#define CLIP_MOSSRUNNER_TURN 274
+#define CLIP_MOSSRUNNER_WALK 275
+#define CLIP_LEAPER_ATTACK 276
+#define CLIP_LEAPER_DEATH_AIR 277
+#define CLIP_LEAPER_DEATH_LAND 278
+#define CLIP_LEAPER_IDLE 279
+#define CLIP_LEAPER_LAND 280
+#define CLIP_LEAPER_TURN 281
+#define CLIP_LEAPER_WALK 282
+#define CLIP_GUARD_ANTICIPATE 283
+#define CLIP_GUARD_ATTACK2 284
+#define CLIP_GUARD_DEATH_AIR 285
+#define CLIP_GUARD_DEATH_LAND 286
+#define CLIP_GUARD_DORMANT 287
+#define CLIP_GUARD_IDLE 288
+#define CLIP_GUARD_RUN 289
+#define CLIP_GUARD_STARTLE 290
+#define CLIP_GUARD_STOMP_ANTIC 291
+#define CLIP_GUARD_STOMP_JUMP 292
+#define CLIP_GUARD_STOMP_LAND 293
+#define CLIP_GUARD_STOP_RUN 294
+#define CLIP_GUARD_STOP_WALK 295
+#define CLIP_GUARD_SWIPE 296
+#define CLIP_GUARD_TURN 297
+#define CLIP_GUARD_WAKE 298
+#define CLIP_GUARD_WALK 299
+#define CLIP_FK_ATTACK 300
+#define CLIP_FK_ATTACK_ANTIC 301
+#define CLIP_FK_ATTACK_RECOVER 302
+#define CLIP_FK_BLANK 303
+#define CLIP_FK_BODY 304
+#define CLIP_FK_DEATH_FALL 305
+#define CLIP_FK_DEATH_HEAD_1 306
+#define CLIP_FK_DEATH_HEAD_2 307
+#define CLIP_FK_DEATH_LAND 308
+#define CLIP_FK_DEATH_SPAZ 309
+#define CLIP_FK_IDLE 310
+#define CLIP_FK_JUMP 311
+#define CLIP_FK_JUMP_ANTIC 312
+#define CLIP_FK_JUMP_ATTACK_HIT_1 313
+#define CLIP_FK_JUMP_ATTACK_HIT_2 314
+#define CLIP_FK_JUMP_ATTACK_HIT_3 315
+#define CLIP_FK_JUMP_ATTACK_UP 316
+#define CLIP_FK_LAND 317
+#define CLIP_FK_RAGE 318
+#define CLIP_FK_RUN 319
+#define CLIP_FK_RUN_ANTIC 320
+#define CLIP_FK_STUN_HIT 321
+#define CLIP_FK_STUN_OPEN 322
+#define CLIP_FK_STUN_OPENED 323
+#define CLIP_FK_STUN_RECOVER 324
+#define CLIP_FK_STUN_ROLL 325
+#define CLIP_FK_STUN_ROLL_END 326
+#define CLIP_FK_TURN 327
+#define CLIP_FKHEAD_DEATH_LAND 328
+#define CLIP_FKHEAD_HEAD_HIT 329
+#define CLIP_FKHEAD_HEAD_IDLE 330
+#define CLIP_FKHEAD_HEAD_SPAZ 331
+#define CLIP_HATCHER_DEATH_AIR 332
+#define CLIP_HATCHER_DEATH_LAND 333
+#define CLIP_HATCHER_FIRE 334
+#define CLIP_HATCHER_FLY 335
+#define CLIP_HATCHLING_FLY 336
+#define CLIP_SLUG_BOUNCE 337
+#define CLIP_SLUG_DEATH_AIR 338
+#define CLIP_SLUG_DEATH_LAND 339
+#define CLIP_SLUG_IDLE_TODOWN 340
+#define CLIP_SLUG_IDLE_TOUP 341
+#define CLIP_SLUG_IDLE_UP 342
+#define CLIP_SLUG_RUN 343
+#define CLIP_SLUG_STARTLE 344
+#define CLIP_GFLY_BURST 345
+#define CLIP_GFLY_CHARGE 346
+#define CLIP_GFLY_CHARGE_ANTIC 347
+#define CLIP_GFLY_CHARGE_RECOVER 348
+#define CLIP_GFLY_DEATH 349
+#define CLIP_GFLY_FALL 350
+#define CLIP_GFLY_FLY 351
+#define CLIP_GFLY_GURGLE_LOOP 352
+#define CLIP_GFLY_GURGLE_ONCE 353
+#define CLIP_GFLY_SLAM_DOWN 354
+#define CLIP_GFLY_SLAM_END 355
+#define CLIP_GFLY_SLAM_UP 356
+#define CLIP_GFLY_SLEEP 357
+#define CLIP_GFLY_STOP 358
+#define CLIP_GFLY_WAKE 359
+#define CLIP_GFLY_WIGGLE 360
+#define CLIP_MOSSWALKER_APPEAR 361
+#define CLIP_MOSSWALKER_BURY 362
+#define CLIP_MOSSWALKER_DEATH_AIR 363
+#define CLIP_MOSSWALKER_DEATH_LAND 364
+#define CLIP_MOSSWALKER_SHAKE 365
+#define CLIP_MOSSWALKER_TURN 366
+#define CLIP_MOSSWALKER_WALK 367
+#define CLIP_PIGEON_FLY 368
+#define CLIP_PIGEON_IDLE_01 369
+#define CLIP_PIGEON_IDLE_02 370
+#define CLIP_PIGEON_IDLE_03 371
+#define CLIP_PLANTTRAP_DEATH 372
+#define CLIP_PLANTTRAP_IDLE 373
+#define CLIP_PLANTTRAP_RETRACT 374
+#define CLIP_PLANTTRAP_SNAP 375
+#define CLIP_PLANTTRAP_SNAP_READY 376
+#define CLIP_SHAKER_ATTACK 377
+#define CLIP_SHAKER_DEATH_AIR 378
+#define CLIP_SHAKER_DEATH_LAND 379
+#define CLIP_SHAKER_IDLE 380
+#define CLIP_SHAKER_TURN 381
+#define CLIP_SHAKER_WALK 382
+#define CLIP_MOSQUITO_ATTACK 383
+#define CLIP_MOSQUITO_ATTACK_ANTIC 384
+#define CLIP_MOSQUITO_DEATH_AIR 385
+#define CLIP_MOSQUITO_DEATH_LAND 386
+#define CLIP_MOSQUITO_IDLE 387
+#define CLIP_MOSQUITO_STARTLE 388
+#define CLIP_MOSQUITO_TURNTOIDLE 389
+#define CLIP_FATFLY_ATTACK 390
+#define CLIP_FATFLY_DEATH_AIR 391
+#define CLIP_FATFLY_DEATH_LAND 392
+#define CLIP_FATFLY_FLY 393
+#define CLIP_MOSSCHARGER_APPEAR 394
+#define CLIP_MOSSCHARGER_CHARGE 395
+#define CLIP_MOSSCHARGER_DEATH_AIR 396
+#define CLIP_MOSSCHARGER_DEATH_LAND 397
+#define CLIP_MOSSCHARGER_DISAPPEAR 398
+#define CLIP_MOSSCHARGER_ESCAPE 399
+#define CLIP_MOSSCHARGER_GET_UP 400
+#define CLIP_MOSSCHARGER_STUN 401
+#define CLIP_MOSSCHARGER_TURNRUN 402
+#define CLIP_MOSSKNIGHT_DEATH_AIR 403
+#define CLIP_MOSSKNIGHT_DEATH_LAND 404
+#define CLIP_MOSSKNIGHT_DORMANT_1 405
+#define CLIP_MOSSKNIGHT_DORMANT_2 406
+#define CLIP_MOSSKNIGHT_EVADE 407
+#define CLIP_MOSSKNIGHT_IDLE 408
+#define CLIP_MOSSKNIGHT_SHAKE 409
+#define CLIP_MOSSKNIGHT_SHIELD_FRONT 410
+#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 411
+#define CLIP_MOSSKNIGHT_SHIELD_TOP 412
+#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 413
+#define CLIP_MOSSKNIGHT_SHOOT 414
+#define CLIP_MOSSKNIGHT_SHOOT_END 415
+#define CLIP_MOSSKNIGHT_SLASH 416
+#define CLIP_MOSSKNIGHT_SLASH_2 417
+#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 418
+#define CLIP_MOSSKNIGHT_SLASH_EFFECT 419
+#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 420
+#define CLIP_MOSSKNIGHT_SLASH_END 421
+#define CLIP_MOSSKNIGHT_SLASH_QUICK 422
+#define CLIP_MOSSKNIGHT_TURN 423
+#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 424
+#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 425
+#define CLIP_MOSSKNIGHT_WAKE 426
+#define CLIP_MOSSKNIGHT_WALK 427
+#define CLIP_HORNET_A_DASH 428
+#define CLIP_HORNET_A_DASH_ANTIC 429
+#define CLIP_HORNET_AIR_DASH_EFFECT 430
+#define CLIP_HORNET_DEATH_AIR 431
+#define CLIP_HORNET_EVADE 432
+#define CLIP_HORNET_EVADE_ANTIC 433
+#define CLIP_HORNET_FALL 434
+#define CLIP_HORNET_FLASH 435
+#define CLIP_HORNET_FLOURISH 436
+#define CLIP_HORNET_G_DASH 437
+#define CLIP_HORNET_G_DASH_ANTIC 438
+#define CLIP_HORNET_G_DASH_EFFECT 439
+#define CLIP_HORNET_G_DASH_RECOVER1 440
+#define CLIP_HORNET_G_DASH_RECOVER2 441
+#define CLIP_HORNET_HARD_LAND 442
+#define CLIP_HORNET_IDLE 443
+#define CLIP_HORNET_JUMP 444
+#define CLIP_HORNET_JUMP_ANTIC 445
+#define CLIP_HORNET_LAND 446
+#define CLIP_HORNET_NEEDLE 447
+#define CLIP_HORNET_NEEDLE_THREAD 448
+#define CLIP_HORNET_RUN 449
+#define CLIP_HORNET_SPHERE_ANTIC_A 450
+#define CLIP_HORNET_SPHERE_ANTIC_G 451
+#define CLIP_HORNET_SPHERE_ATTACK 452
+#define CLIP_HORNET_SPHERE_BALL 453
+#define CLIP_HORNET_SPHERE_RECOVER_A 454
+#define CLIP_HORNET_SPHERE_RECOVER_G 455
+#define CLIP_HORNET_STUN 456
+#define CLIP_HORNET_STUN_AIR 457
+#define CLIP_HORNET_THROW 458
+#define CLIP_HORNET_THROW_ANTIC 459
+#define CLIP_HORNET_THROW_EFFECT 460
+#define CLIP_HORNET_THROW_RECOVER 461
+#define CLIP_HORNET_WALL_IMPACT 462
+#define CLIP_HORNET_WOUNDED 463
+#define CLIP_MENDER_DEATH_AIR 464
+#define CLIP_MENDER_DEATH_LAND 465
+#define CLIP_MENDER_FLY 466
+#define CLIP_MENDER_IDLE 467
+#define CLIP_MENDER_STARTLE 468
+#define CLIP_BGATE_BG_CLOSE_1 469
+#define CLIP_BGATE_BG_CLOSE_2 470
+#define CLIP_BGATE_BG_CLOSED 471
+#define CLIP_BGATE_BG_OPEN 472
+#define CLIP_BGATE_BG_OPENED 473
+#define CLIP_BGATE_BONE_GATE_CLOSE 474
+#define CLIP_BGATE_BONE_GATE_CLOSED 475
+#define CLIP_BGATE_BONE_GATE_OPEN 476
+#define CLIP_BGATE_BONE_GATE_OPENED 477
+#define CLIP_BGATE_GATE_IDLE 478
+#define CLIP_BGATE_GATE_OPEN 479
+#define CLIP_BGATE_GATE_OPENED 480
+#define CLIP_BGATE_PILLAR_IDLE 481
+#define CLIP_BGATE_PILLAR_OPENED 482
+#define CLIP_BGATE_SWITCH_ACTIVATED 483
+#define CLIP_BGATE_SWITCH_HIT 484
+#define CLIP_BGATE_SWITCH_IDLE 485
+#define CLIP_BGATE_TOLL_GATE_IDLE 486
+#define CLIP_BGATE_TOLL_GATE_OPEN 487
+#define CLIP_COCOON_COCOON_IDLE 488
+#define CLIP_COCOON_COCOON_SWEAT 489
+#define CLIP_COCOON_SCUTTLER_LAND 490
+#define CLIP_COCOON_SCUTTLER_RUN 491
+#define CLIP_FX_SPLAT 492
+#define CLIP_FX_SPLAT2 493
+#define CLIP_FX_SWORD 494
+#define CLIP_FIREBALL_BLAST 495
+#define CLIP_FIREBALL_BALL 496
+#define CLIP_FIREBALL_BALL_END 497
+#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 498
+#define CLIP_DRIP_IDLE 499
+#define CLIP_DRIP_DRIP 500
+#define CLIP_DRIP_FALL 501
+#define CLIP_DRIP_IMPACT 502
+#define CLIP_HORNETCS_EVADE 503
+#define CLIP_HORNETCS_EVADE_ANTIC 504
+#define CLIP_HORNETCS_FALL 505
+#define CLIP_HORNETCS_HARPOON_SIDE 506
+#define CLIP_HORNETCS_IDLE 507
+#define CLIP_HORNETCS_JUMP_FULL 508
+#define CLIP_HORNETCS_POINT 509
+#define CLIP_HORNETCS_RUN 510
+#define CLIP_HORNETCS_SOFT_LAND 511
+#define CLIP_HORNETCS_THREAD_1 512
+#define CLIP_HORNETCS_THROW_SIDE 513
+#define CLIP_HORNETCS_THROW_SIDE_START 514
+#define CLIP_HORNETCS_TURN 515
+#define CLIP_HORNETCS_TURNTOIDLE 516
+#define CLIP_BULLET_IDLE 517
+#define CLIP_BULLET_IMPACT 518
+#define CLIP_BULLET_SHOCKWAVE_SPURT 519
+#define CLIP_PROP0_WATERFALL_LOOP 520
+#define CLIP_PROP1_TORCH2 521
+#define CLIP_PROP1_TORCH3 522
+#define CLIP_VM0_FLOWER 523
+#define CLIP_VM0_IDLE 524
+#define CLIP_VM0_REACH 525
+#define CLIP_VM0_REACH_TO_IDLE 526
+#define CLIP_VM0_TALK_LEFT 527
+#define CLIP_VM0_TALK_RIGHT 528
+#define CLIP_VM0_TURN_LEFT 529
+#define CLIP_VM0_TURN_RIGHT 530
+#define CLIP_VM2_IDLE 531
+#define CLIP_VM2_LOOKLEFT 532
+#define CLIP_VM2_LOOKRIGHT 533
+#define CLIP_VM3_IDLE 534
+#define CLIP_VM3_TALK 535
+#define CLIP_VM3_TALK_END 536
+#define CLIP_VM4_IDLE 537
+#define CLIP_VM4_LOOKLEFT 538
+#define CLIP_VM4_LOOKRIGHT 539
+#define CLIP_VM4_SIT 540
+#define CLIP_VM4_SIT_TALK 541
+#define CLIP_VM4_SIT_TALK_END 542
+#define CLIP_VM5_ARRIVE 543
+#define CLIP_VM5_ARRIVE_SMOKE 544
+#define CLIP_VM5_IDLE 545
+#define CLIP_VM6_BELL_IDLE 546
+#define CLIP_VM6_BELL_RING_R 547
+#define CLIP_VM6_BELL_STAND 548
+#define CLIP_VM6_BELL_STAND_APPEAR 549
+#define CLIP_VM6_BOX_DISAPPEAR 550
+#define CLIP_VM6_BOX_DISAPPEAR_QUICK 551
+#define CLIP_VM6_BOX_IDLE 552
+#define CLIP_VM6_FRONT 553
+#define CLIP_VM6_GRATE_DISAPPEAR 554
+#define CLIP_VM6_GRATE_IDLE 555
+#define CLIP_VM8_DAZED 556
+#define CLIP_VM8_IDLE 557
+#define CLIP_VM8_TURN_L 558
+#define CLIP_VM8_TURN_R 559
+#define CLIP_VM8_WAKE 560
+#define CLIP_VM11_HEGEMOL_CAST 561
+#define CLIP_VM11_HEGEMOL_IDLE 562
+#define CLIP_VM11_LURIEN_CAST 563
+#define CLIP_VM11_LURIEN_IDLE 564
+#define CLIP_VM11_MONOMON_CAST 565
+#define CLIP_VM11_MONOMON_IDLE 566
+#define CLIP_VM12_IDLE 567
+#define CLIP_VM12_SIT_IDLE 568
+#define CLIP_VM12_SIT_TALK 569
+#define CLIP_VM12_SIT_TALK_END 570
+#define CLIP_VM12_SUMMON 571
+#define CLIP_VM12_TALK 572
+#define CLIP_VM12_TALK_END 573
+#define CLIP_VM12_TURN 574
+#define CLIP_VM14_IDLE 575
+#define CLIP_VM14_LOOK_LEFT 576
+#define CLIP_VM14_LOOK_RIGHT 577
+#define CLIP_VM14_TALK_CONVO_END 578
+#define CLIP_VM14_TALK_CONVO_START 579
+#define CLIP_VM14_TALK_SHOP_END 580
+#define CLIP_VM14_TALK_SHOP_START 581
+#define CLIP_VM15_IDLE 582
+#define CLIP_VM15_SHOP_END 583
+#define CLIP_VM15_SHOP_START 584
+#define CLIP_VM15_TALK_END 585
+#define CLIP_VM15_TALK_START 586
+#define CLIP_VM16_CRY 587
+#define CLIP_VM16_CRY_TURN 588
+#define CLIP_VM16_FREED 589
+#define CLIP_VM16_HOME_BOUNCE 590
+#define CLIP_VM16_HOME_WAVE 591
+#define CLIP_VM16_IDLE 592
+#define CLIP_VM17_CRUMBLE 593
+#define CLIP_VM17_IDLE 594
+#define CLIP_VM18_BECKON 595
+#define CLIP_VM18_CHEER 596
+#define CLIP_VM18_CRY 597
+#define CLIP_VM18_GIFT 598
+#define CLIP_VM18_IDLE 599
+#define CLIP_VM20_RIPPLE_WATER 600
+#define CLIP_VM21_IDLE 601
+#define CLIP_VM21_TALK_L 602
+#define CLIP_VM21_TALK_L_END 603
+#define CLIP_VM21_TALK_R 604
+#define CLIP_VM21_TALK_R_END 605
+#define CLIP_ANIM0_STAG_DOOR_OPEN00 606
+#define CLIP_ANIM1_DASH_CLOAK_CORPSE000 607
+#define CLIP_ANIM2_GROUND_PLINK_0 608
+#define CLIP_ANIM3_FIREBALL_COLLECT_ANIM 609
+#define CLIP_ANIM4_DOOR_OPEN00 610
#define SPRITE_HERO_LIGHT 2868
#define SPRITE_DIALOGUE_BACKBOARD 2869
#define SPRITE_PROMPT_SHADOW 2870
@@ -722,7 +723,7 @@
#define EK_HORNET 29
#define EK_MENDER 30
#define NUM_KINDS 31
-#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 204, 203, -1, -1, -1, -1, -1, -1, -1, -1, 206, 207}}, {EF_BUZZER, {209, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 211, 212}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 219, 218, -1, -1, -1, -1, -1, -1, -1, 216, 217}}, {EF_BOUNCER, {-1, -1, -1, 222, -1, -1, -1, -1, -1, -1, -1, 220, 221}}, {EF_SPITTER, {-1, -1, -1, 225, 226, 224, -1, -1, -1, -1, -1, 223, -1}}, {EF_ROLLER, {229, -1, -1, 231, 230, 232, -1, -1, -1, -1, -1, 227, 228}}, {EF_BLOCKER, {239, -1, -1, 235, 240, 233, 234, 241, 242, 238, 237, -1, 236}}, {EF_HUSK, {248, 249, 250, 243, 245, 244, -1, -1, -1, -1, -1, 246, 247}}, {EF_HUSK, {256, 257, 258, 251, 253, 252, -1, -1, -1, -1, -1, 254, 255}}, {EF_HUSK, {264, 265, 266, 259, 261, 260, -1, -1, -1, -1, -1, 262, 263}}, {EF_HUSK, {272, 273, 274, 267, 269, 268, -1, -1, -1, -1, -1, 270, 271}}, {EF_LEAPER, {278, 280, 281, 275, 279, -1, -1, -1, -1, -1, -1, 276, 277}}, {EF_GUARD, {287, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 284, 285}}, {EF_FK, {309, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 307}}, {EF_FKHEAD, {329, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 327}}, {EF_HATCHER, {-1, -1, -1, 334, 333, -1, -1, -1, -1, -1, -1, 331, 332}}, {EF_HATCHLING, {-1, -1, -1, 335, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {341, -1, -1, 339, 340, 343, 342, 336, -1, -1, -1, 337, 338}}, {EF_GFLY, {356, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 365, 366, 364, 360, 361, -1, -1, -1, -1, -1, 362, 363}}, {EF_PIGEON, {-1, -1, -1, 368, 369, 370, 367, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {372, -1, -1, 375, 374, 373, -1, -1, -1, -1, -1, 371, -1}}, {EF_SHAKER, {379, 380, 381, 376, -1, -1, -1, -1, -1, -1, -1, 377, 378}}, {EF_MOSQUITO, {386, -1, -1, 388, 387, 383, 382, -1, -1, -1, -1, 384, 385}}, {EF_FATFLY, {392, -1, -1, 389, -1, -1, -1, -1, -1, -1, -1, 390, 391}}, {EF_MOSSCHARGER, {-1, -1, -1, 393, 394, 397, 400, 399, 401, 398, -1, 395, 396}}, {EF_MOSSKNIGHT, {407, 422, 426, -1, -1, -1, -1, -1, -1, -1, -1, 402, 403}}, {EF_HORNET, {442, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 430, -1}}, {EF_MENDER, {466, -1, -1, 467, 465, -1, -1, -1, -1, -1, -1, 463, 464}}}
+#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 205, 204, -1, -1, -1, -1, -1, -1, -1, -1, 207, 208}}, {EF_BUZZER, {210, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 212, 213}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 220, 219, -1, -1, -1, -1, -1, -1, -1, 217, 218}}, {EF_BOUNCER, {-1, -1, -1, 223, -1, -1, -1, -1, -1, -1, -1, 221, 222}}, {EF_SPITTER, {-1, -1, -1, 226, 227, 225, -1, -1, -1, -1, -1, 224, -1}}, {EF_ROLLER, {230, -1, -1, 232, 231, 233, -1, -1, -1, -1, -1, 228, 229}}, {EF_BLOCKER, {240, -1, -1, 236, 241, 234, 235, 242, 243, 239, 238, -1, 237}}, {EF_HUSK, {249, 250, 251, 244, 246, 245, -1, -1, -1, -1, -1, 247, 248}}, {EF_HUSK, {257, 258, 259, 252, 254, 253, -1, -1, -1, -1, -1, 255, 256}}, {EF_HUSK, {265, 266, 267, 260, 262, 261, -1, -1, -1, -1, -1, 263, 264}}, {EF_HUSK, {273, 274, 275, 268, 270, 269, -1, -1, -1, -1, -1, 271, 272}}, {EF_LEAPER, {279, 281, 282, 276, 280, -1, -1, -1, -1, -1, -1, 277, 278}}, {EF_GUARD, {288, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 285, 286}}, {EF_FK, {310, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 308}}, {EF_FKHEAD, {330, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 328}}, {EF_HATCHER, {-1, -1, -1, 335, 334, -1, -1, -1, -1, -1, -1, 332, 333}}, {EF_HATCHLING, {-1, -1, -1, 336, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {342, -1, -1, 340, 341, 344, 343, 337, -1, -1, -1, 338, 339}}, {EF_GFLY, {357, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 366, 367, 365, 361, 362, -1, -1, -1, -1, -1, 363, 364}}, {EF_PIGEON, {-1, -1, -1, 369, 370, 371, 368, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {373, -1, -1, 376, 375, 374, -1, -1, -1, -1, -1, 372, -1}}, {EF_SHAKER, {380, 381, 382, 377, -1, -1, -1, -1, -1, -1, -1, 378, 379}}, {EF_MOSQUITO, {387, -1, -1, 389, 388, 384, 383, -1, -1, -1, -1, 385, 386}}, {EF_FATFLY, {393, -1, -1, 390, -1, -1, -1, -1, -1, -1, -1, 391, 392}}, {EF_MOSSCHARGER, {-1, -1, -1, 394, 395, 398, 401, 400, 402, 399, -1, 396, 397}}, {EF_MOSSKNIGHT, {408, 423, 427, -1, -1, -1, -1, -1, -1, -1, -1, 403, 404}}, {EF_HORNET, {443, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 431, -1}}, {EF_MENDER, {467, -1, -1, 468, 466, -1, -1, -1, -1, -1, -1, 464, 465}}}
#define TXT_PROMPT_LISTEN 108
#define TXT_PROMPT_REST 109
#define TXT_PROMPT_INSPECT 110
@@ -925,10 +926,10 @@
#define VMEV_FIRST_MAP_DOWN 45
#define VMEV_FK_RAGE_COMPLETE 46
#define VMSTR_NPC_TITLE 14
-#define VMSTR_VISITED 686
-#define VMSTR_DISPLAY_RIGHT 687
+#define VMSTR_VISITED 691
+#define VMSTR_DISPLAY_RIGHT 692
#define VMSTR_HORNET_SAVER 201
-#define VMSTR_ITEM 571
+#define VMSTR_ITEM 573
#define STR_ATTACK_RANGE 24
#define STR_EVADE_RANGE 50
#define STR_SPIT_RANGE 51
@@ -1066,15 +1067,16 @@
#define TXT_PAUSE_CONTINUE 209
#define TXT_PAUSE_MAIN 210
#define TXT_PROFILE_CORRUPTED 211
-#define TXT_SCREEN_SAVE_PROFILES 212
-#define TXT_SCREEN_KEYBOARD 213
-#define MENU_KEYS {{214, 225}, {215, 226}, {216, 227}, {217, 228}, {218, 229}, {219, 230}, {220, 231}, {221, 232}, {222, 233}, {223, 234}, {224, 235}}
+#define TXT_PROFILE_LOADING 212
+#define TXT_SCREEN_SAVE_PROFILES 213
+#define TXT_SCREEN_KEYBOARD 214
+#define MENU_KEYS {{215, 226}, {216, 227}, {217, 228}, {218, 229}, {219, 230}, {220, 231}, {221, 232}, {222, 233}, {223, 234}, {224, 235}, {225, 236}}
#define MENU_NKEYS 11
-#define TXT_HELP 236
-#define TXT_HELP_TITLE 237
-#define TXT_NEXT 238
-#define TXT_HELP_LINES 239
-#define TXT_ZONES {240, 241, 242, 243, 244}
+#define TXT_HELP 237
+#define TXT_HELP_TITLE 238
+#define TXT_NEXT 239
+#define TXT_HELP_LINES 240
+#define TXT_ZONES {241, 242, 243, 244, 245}
#define INV_X -4.0500f
#define INV_Y 7.5500f
#define INV_BORDER {{2919, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2919, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2920, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2921, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2922, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2923, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
@@ -1087,7 +1089,7 @@
#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 {247, 248, 249, 250}
+#define TXT_INV_PANES {248, 249, 250, 251}
#define CH_BB {2927, -7.9200f, -8.3700f, 1.0000f, 1.0000f}
#define CH_BB_POS {{-7.9200f, -8.3700f}, {-6.4200f, -8.3700f}, {-4.9200f, -8.3400f}, {-3.4200f, -8.3400f}, {-1.9200f, -8.3400f}, {-0.4200f, -8.3400f}, {1.0800f, -8.3400f}, {2.5800f, -8.3400f}, {4.0800f, -8.3400f}, {5.5800f, -8.3400f}, {-7.0100f, -9.7900f}, {-5.5100f, -9.7900f}, {-4.0100f, -9.7900f}, {-2.5100f, -9.7900f}, {-1.0100f, -9.7900f}, {0.4900f, -9.7900f}, {1.9900f, -9.7900f}, {3.4900f, -9.7900f}, {4.9900f, -9.7900f}, {6.4900f, -9.7900f}, {-7.9200f, -11.2600f}, {-6.4200f, -11.2600f}, {-4.9200f, -11.2600f}, {-3.4200f, -11.2600f}, {-1.9200f, -11.2600f}, {-0.4200f, -11.2600f}, {1.0800f, -11.2600f}, {2.5800f, -11.2600f}, {4.0800f, -11.2600f}, {5.5800f, -11.2600f}, {-7.0100f, -12.7200f}, {-5.5100f, -12.7200f}, {-4.0100f, -12.7200f}, {-2.5100f, -12.7200f}, {-1.0100f, -12.7200f}, {0.4900f, -12.7200f}, {1.9900f, -12.7200f}, {3.4900f, -12.7200f}, {4.9900f, -12.7200f}, {6.4900f, -12.7200f}}
#define CH_BB_BOX {1.5002f, 1.4969f, -0.0257f, 0.0685f}
@@ -1123,17 +1125,17 @@
#define CH_CURSOR {2934, 0.0000f, 0.0000f, 1.0000f, 0.9756f}
#define CH_CURSOR_K {1.0720f, 1.0458f}
#define CH_CURSOR_CORNERS {{1.0000f, 1.0000f}, {-1.1000f, 1.0000f}, {1.0000f, -1.0089f}, {-1.1000f, -1.0089f}}
-#define TXT_CHARM_TXT_EQUIPPED 251
-#define TXT_CHARM_TXT_OVERCHARMED 252
-#define TXT_CHARM_TXT_COST 253
-#define TXT_CTRL_EQUIP 254
-#define TXT_CTRL_UNEQUIP 255
-#define TXT_CHARM_ALERT_NONE 256
-#define TXT_CHARM_ALERT_NONE_BENCH 257
-#define TXT_CHARM_NOTCHES 258
-#define TXT_CHARM_NAMES_INV {-1, 259, 260, 261, 262, -1, 263, 264, 265, -1, -1, -1, -1, -1, 266, -1, -1, -1, 267, 268, 269, -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, 270, 271, 272, 273, -1, 274, 275, 276, -1, -1, -1, -1, -1, 277, -1, -1, -1, 278, 279, 280, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define TXT_KEY_OK 281
+#define TXT_CHARM_TXT_EQUIPPED 252
+#define TXT_CHARM_TXT_OVERCHARMED 253
+#define TXT_CHARM_TXT_COST 254
+#define TXT_CTRL_EQUIP 255
+#define TXT_CTRL_UNEQUIP 256
+#define TXT_CHARM_ALERT_NONE 257
+#define TXT_CHARM_ALERT_NONE_BENCH 258
+#define TXT_CHARM_NOTCHES 259
+#define TXT_CHARM_NAMES_INV {-1, 260, 261, 262, 263, -1, 264, 265, 266, -1, -1, -1, -1, -1, 267, -1, -1, -1, 268, 269, 270, -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, 271, 272, 273, 274, -1, 275, 276, 277, -1, -1, -1, -1, -1, 278, -1, -1, -1, 279, 280, 281, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define TXT_KEY_OK 282
#define INV_FIXED {{2935, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2936, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2937, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2938, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2939, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2940, -5.7200f, -13.3200f, 1.0000f, 1.0000f}}
#define INV_FIXED_BG {{-1, 0, 0, 0, 0}, {-1, 0, 0, 0, 0}, {-1, 0, 0, 0, 0}, {2941, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2942, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}
#define INV_FIXED_BOX {{1.9363f, 2.9287f, -0.0651f, 0.0923f}, {1.4420f, 1.4140f, -0.0546f, 0.0682f}, {1.6244f, 5.3245f, 0.0126f, 0.1884f}, {1.7500f, 1.7500f, 0.0000f, 0.0000f}, {1.8505f, 1.8756f, -0.0503f, 0.0629f}, {7.8215f, 1.4409f, 1.7816f, -0.0205f}}
@@ -1153,12 +1155,12 @@
#define INV_DIVIDERS {{2961, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2961, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}
#define INV_NAME {12.9500f, -1.9345f, 8.3290f}
#define INV_DESC {9.2144f, -3.1678f, 7.6475f}
-#define TXT_INV_HEART {{282, 283}, {284, 285}, {286, 287}, {284, 288}, {284, 289}, {290, 291}}
-#define TXT_INV_VESSEL {{282, 283}, {292, 293}, {294, 295}, {292, 296}, {297, 298}}
-#define TXT_INV_FIXED {{299, 300}, {301, 302}, {303, 304}, {305, 306}}
-#define TXT_INV_EQ {{307, 308}, {309, 310}, {311, 312}, {313, 314}, {315, 316}, {317, 318}}
-#define TXT_INV_QUILL {319, 320, 321, 322}
-#define TXT_INV_TRINKETS {{323, 324}, {325, 326}, {327, 328}, {329, 330}}
+#define TXT_INV_HEART {{283, 284}, {285, 286}, {287, 288}, {285, 289}, {285, 290}, {291, 292}}
+#define TXT_INV_VESSEL {{283, 284}, {293, 294}, {295, 296}, {293, 297}, {298, 299}}
+#define TXT_INV_FIXED {{300, 301}, {302, 303}, {304, 305}, {306, 307}}
+#define TXT_INV_EQ {{308, 309}, {310, 311}, {312, 313}, {314, 315}, {316, 317}, {318, 319}}
+#define TXT_INV_QUILL {320, 321, 322, 323}
+#define TXT_INV_TRINKETS {{324, 325}, {326, 327}, {328, 329}, {330, 331}}
#define SHOP_BACKBOARD {2962, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
#define SHOP_MASK_TOP {2963, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
#define SHOP_MASK_BOTTOM {2964, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
@@ -1170,7 +1172,7 @@
#define SHOP_POINTER_R {2968, 6.6249f, -2.0798f, -1.0000f, 1.0000f}
#define SHOP_MASK_A {0, 0, 255, 255, 255, 255, 255, 254, 249, 230, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 73, 134, 178, 204, 226, 223, 0, 0, 0, 0, 0, 0}
#define SHOP_CONFIRM_ITEM {5.0900f, 2.4700f}
-#define TXT_KEY_BACK 332
+#define TXT_KEY_BACK 333
#define SHOP_BACKBOARD_A 0.8910f
#define SHOP_BORDERS {{5.1437f, 3.6600f, 1.1244f, 1.0000f, CLIP_SHOPUI_SHOP_MENU_TOP_UP, CLIP_SHOPUI_SHOP_MENU_TOP_DOWN, 0.0000f}, {5.1937f, -5.7000f, 1.1338f, 1.0000f, CLIP_SHOPUI_SHOP_MENU_BOTTOM_UP, CLIP_SHOPUI_SHOP_MENU_BOTTOM_DOWN, 0.0000f}}
#define SHOP_FIGUREHEADS {{5.1437f, 6.6400f, 1.0000f, 1.0000f, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_UP, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_DOWN, 0.3500f}, {5.1437f, 6.7400f, 1.0000f, 1.0000f, CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_UP, CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_DOWN, 0.3500f}, {5.1437f, 6.8300f, 1.0000f, 1.0000f, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_UP, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_DOWN, 0.3500f}}
@@ -1198,24 +1200,24 @@
#define SHOP_ROW_TOP 4.9000f
#define SHOP_ROW_BOTTOM -5.2500f
#define SHOP_ARROW_BOB 0.1500f
-#define TXT_SHOP_CTRL_BUY 335
-#define TXT_SHOP_CTRL_EXIT 336
-#define TXT_SHOP_CTRL_CONFIRM 337
-#define TXT_SHOP_CTRL_CANCEL 338
-#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 339
-#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 340
-#define TXT_SHOP_CHARM_TXT_NOTCHCOST 341
-#define TXT_SHOP_YES 342
-#define TXT_SHOP_NO 343
+#define TXT_SHOP_CTRL_BUY 336
+#define TXT_SHOP_CTRL_EXIT 337
+#define TXT_SHOP_CTRL_CONFIRM 338
+#define TXT_SHOP_CTRL_CANCEL 339
+#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 340
+#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 341
+#define TXT_SHOP_CHARM_TXT_NOTCHCOST 342
+#define TXT_SHOP_YES 343
+#define TXT_SHOP_NO 344
#define SHOP_DESC_BOTTOM -5.0500f
-#define SHOP_ITEMS {{2971, 0.5714f, 344, 345, 150, 1, 125, -1, 0, 0}, {2971, 0.5714f, 344, 346, 500, 1, 126, 125, 0, 0}, {2972, 0.5714f, 347, 348, 550, 3, 127, -1, 0, 0}, {2973, 0.5714f, 349, 350, 950, 10, 128, -1, 0, 0}, {2974, 0.5714f, 351, 352, 300, 2, 37, -1, 0, 1}, {2975, 0.5714f, 353, 354, 200, 2, 40, -1, 0, 4}, {2976, 0.5714f, 355, 356, 1800, 0, 119, -1, 0, 0}, {2977, 0.5714f, 357, 358, 60, 11, 129, -1, 0, 0}, {2978, 0.5714f, 359, 360, 220, 2, 38, -1, 0, 2}, {2979, 0.5714f, 361, 362, 120, 0, 2, -1, 0, 0}, {2980, 0.5714f, 363, 364, 40, 9, 130, 10, 0, 0}, {2980, 0.5714f, 365, 366, 80, 9, 131, 28, 0, 0}, {2981, 0.5714f, 367, 368, 100, 16, 133, -1, 0, 0}, {2982, 0.5714f, 369, 370, 100, 16, 134, -1, 0, 0}, {2983, 0.5714f, 371, 372, 100, 16, 135, -1, 0, 0}, {2984, 0.5714f, 373, 374, 100, 16, 137, 147, 0, 0}, {2985, 0.5714f, 375, 376, 100, 16, 136, -1, 0, 0}, {2986, 0.5714f, 377, 378, 100, 17, 139, -1, 0, 0}, {2987, 0.5714f, 379, 380, 100, 17, 140, -1, 0, 0}, {2988, 0.5714f, 381, 382, 100, 17, 141, 14, 0, 0}, {2989, 0.5714f, 383, 384, 210, 17, 142, 14, 0, 0}, {2990, 0.5714f, 385, 386, 250, 2, 44, -1, 0, 8}, {2991, 0.5714f, 387, 388, 300, 2, 54, -1, 0, 18}, {2992, 0.5714f, 389, 390, 120, 2, 50, -1, 0, 14}, {2993, 0.5714f, 391, 392, 220, 2, 55, -1, 0, 19}, {2994, 0.5714f, 393, 394, 800, 2, 43, -1, 0, 7}, {2995, 0.5714f, 395, 396, 120, 8, 143, -1, 5, 0}, {2995, 0.5714f, 395, 396, 500, 8, 144, -1, 10, 0}, {2995, 0.5714f, 395, 396, 900, 8, 145, -1, 18, 0}, {2995, 0.5714f, 395, 397, 1400, 8, 146, -1, 25, 0}}
+#define SHOP_ITEMS {{2971, 0.5714f, 345, 346, 150, 1, 125, -1, 0, 0}, {2971, 0.5714f, 345, 347, 500, 1, 126, 125, 0, 0}, {2972, 0.5714f, 348, 349, 550, 3, 127, -1, 0, 0}, {2973, 0.5714f, 350, 351, 950, 10, 128, -1, 0, 0}, {2974, 0.5714f, 352, 353, 300, 2, 37, -1, 0, 1}, {2975, 0.5714f, 354, 355, 200, 2, 40, -1, 0, 4}, {2976, 0.5714f, 356, 357, 1800, 0, 119, -1, 0, 0}, {2977, 0.5714f, 358, 359, 60, 11, 129, -1, 0, 0}, {2978, 0.5714f, 360, 361, 220, 2, 38, -1, 0, 2}, {2979, 0.5714f, 362, 363, 120, 0, 2, -1, 0, 0}, {2980, 0.5714f, 364, 365, 40, 9, 130, 10, 0, 0}, {2980, 0.5714f, 366, 367, 80, 9, 131, 28, 0, 0}, {2981, 0.5714f, 368, 369, 100, 16, 133, -1, 0, 0}, {2982, 0.5714f, 370, 371, 100, 16, 134, -1, 0, 0}, {2983, 0.5714f, 372, 373, 100, 16, 135, -1, 0, 0}, {2984, 0.5714f, 374, 375, 100, 16, 137, 147, 0, 0}, {2985, 0.5714f, 376, 377, 100, 16, 136, -1, 0, 0}, {2986, 0.5714f, 378, 379, 100, 17, 139, -1, 0, 0}, {2987, 0.5714f, 380, 381, 100, 17, 140, -1, 0, 0}, {2988, 0.5714f, 382, 383, 100, 17, 141, 14, 0, 0}, {2989, 0.5714f, 384, 385, 210, 17, 142, 14, 0, 0}, {2990, 0.5714f, 386, 387, 250, 2, 44, -1, 0, 8}, {2991, 0.5714f, 388, 389, 300, 2, 54, -1, 0, 18}, {2992, 0.5714f, 390, 391, 120, 2, 50, -1, 0, 14}, {2993, 0.5714f, 392, 393, 220, 2, 55, -1, 0, 19}, {2994, 0.5714f, 394, 395, 800, 2, 43, -1, 0, 7}, {2995, 0.5714f, 396, 397, 120, 8, 143, -1, 5, 0}, {2995, 0.5714f, 396, 397, 500, 8, 144, -1, 10, 0}, {2995, 0.5714f, 396, 397, 900, 8, 145, -1, 18, 0}, {2995, 0.5714f, 396, 398, 1400, 8, 146, -1, 25, 0}}
#define SHOP_FIRST {0, 8, 21, 30}
#define SHOP_ROW_GEO {2970, 1.4551f, 0.0000f, 1.0000f, 1.0000f}
#define SHOP_ROW_COST {1.8423f, 0.2885f}
#define SHOP_ACTIVE_RGB {255, 255, 255}
#define SHOP_INACTIVE_RGB {141, 141, 141}
#define SHOP_ROOMS {"Room_shop", "Room_mapper", "Room_Charm_Shop"}
-#define SHOP_NOSTOCK {399, 400, 401}
+#define SHOP_NOSTOCK {400, 401, 402}
#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}
@@ -1241,24 +1243,24 @@
#define STAG_LIST_KNIGHT {3001, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
#define STAG_DIVIDER {3004, -7.6003f, 5.2734f, -1.0000f, -0.8696f}
#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}
-#define TXT_STAG_STATIONS 402
-#define TXT_STAG_NAMES {403, 363, 365}
+#define TXT_STAG_STATIONS 403
+#define TXT_STAG_NAMES {404, 364, 366}
#define STAG_NAMES_STR {124, 123, 127}
#define STAG_BORDER_TOP {-0.0963f, 7.0185f, 0.9784f, 1.0028f, CLIP_STAGUI_STAG_BORDER_TOP_UP, CLIP_STAGUI_STAG_BORDER_TOP_DOWN, 0}
#define STAG_BORDER_BOTTOM {-0.0638f, -6.5632f, 0.9165f, 0.9394f, CLIP_STAGUI_STAG_BORDER_BOTTOM_UP, CLIP_STAGUI_STAG_BORDER_BOTTOM_DOWN, 0}
#define STAG_T_ACT_CONFIRM {11.1713f, -4.5306f, 15.3500f}
#define STAG_KEY_CONFIRM {11.7464f, -4.7993f}
-#define TXT_STAG_CTRL_TRAVEL 404
+#define TXT_STAG_CTRL_TRAVEL 405
#define STAG_T_ACT_CANCEL {11.1713f, -5.3525f, 15.3500f}
#define STAG_KEY_CANCEL {11.7464f, -5.6213f}
-#define TXT_STAG_CTRL_CANCEL 338
+#define TXT_STAG_CTRL_CANCEL 339
#define STAG_SCENES_STR {137, 136, 138}
#define STAG_SCENES_ROOM {4, 19, 36}
-#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 408, 0x14u}, {2, 24, 130, -0.0400f, -7.8800f, 411, 0x400020u}, {26, 16, 131, 16.3100f, -7.8700f, 412, 0x40u}}
+#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 409, 0x14u}, {2, 24, 130, -0.0400f, -7.8800f, 412, 0x400020u}, {26, 16, 131, 16.3100f, -7.8700f, 413, 0x40u}}
#define MAP_ROOMS {{0, 1, 3005, 3006, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 0, 3012, 3013, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 12, -1, -1, -1.5030f, 5.1050f, 0.0000f, 0.0000f, 0x000000, 0}, {1, 38, 3015, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 3016, 3017, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 19, 3018, -1, 1.4650f, 4.4640f, 0.6500f, 0.3100f, 0xB5DDFB, 0}, {1, 255, 3019, 3020, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 15, 3021, 3022, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 9, 3023, -1, -3.0980f, 6.4880f, 1.1110f, 0.4800f, 0xB5DDFB, 0}, {1, 10, 3025, 3026, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 25, 3027, -1, -0.6440f, 4.4430f, 0.7000f, 0.3700f, 0xB5DDFB, 0}, {1, 14, 3029, 3030, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 20, 3031, 3032, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 17, 3033, 3034, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 16, 3035, 3036, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3037, 3038, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3039, 3040, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 26, 3041, -1, -3.7180f, 5.7650f, 2.3517f, 0.4300f, 0xB5DDFB, 0}, {1, 13, 3043, 3044, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 24, 3045, 3046, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 8, 3047, 3048, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 11, 3049, -1, -1.5030f, 5.1050f, 0.8500f, 0.8900f, 0xB5DDFB, 0}, {1, 21, 3050, -1, 3.7290f, 3.4460f, 2.4100f, 0.6600f, 0xB5DDFB, 0}, {1, 18, 3052, 3053, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 6, 3054, 3055, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 5, 3056, 3057, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 3058, 3059, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 33, 3060, 3061, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 32, 3062, 3063, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 3064, 3065, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 35, 3066, -1, -12.3910f, 5.0270f, 0.5700f, 1.9700f, 0xCFFFC3, 0}, {2, 34, 3067, 3068, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3069, 3070, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 30, 3071, -1, -9.2170f, 5.6940f, 1.2300f, 0.4400f, 0xCFFFC3, 0}, {2, 36, 3072, -1, -12.9760f, 5.8120f, 0.6000f, 0.3000f, 0xCFFFC3, 0}, {2, 255, 3073, 3074, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3075, 3076, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 37, 3077, 3078, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 31, 3079, -1, -10.4130f, 5.6780f, 1.1700f, 0.5500f, 0xCFFFC3, 0}, {2, 29, 3080, 3081, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 28, 3082, 3083, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 27, 3084, 3085, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}
#define MAP_PINS {{0, 0, 3007, -2.0390f, 7.7500f, 133, -1}, {0, 0, 3008, -1.6430f, 7.7500f, 137, -1}, {0, 0, 3009, -2.4700f, 7.7500f, 135, 122}, {0, 0, 3010, -1.2540f, 7.7600f, 135, 123}, {1, 1, 3014, -6.2100f, 7.6800f, 134, -1}, {2, 1, 3014, -1.3150f, 5.0920f, 134, -1}, {5, 0, 3008, 1.2400f, 4.4520f, 137, -1}, {5, 0, 3007, 1.6210f, 4.4490f, 133, -1}, {8, 0, 3024, -3.0697f, 6.4597f, 135, -1}, {10, 0, 3007, -0.3430f, 4.4060f, 133, -1}, {10, 0, 3028, -0.7200f, 4.3930f, 136, -1}, {21, 0, 3007, -1.6940f, 5.0880f, 133, -1}, {22, 0, 3051, 4.5530f, 3.3700f, 135, 124}, {22, 0, 3007, 4.9480f, 3.3820f, 133, -1}, {27, 1, 3014, -10.9970f, 6.6240f, 134, -1}, {28, 0, 3007, -11.2580f, 4.9690f, 133, -1}, {34, 0, 3007, -12.8160f, 5.7890f, 133, -1}, {34, 0, 3008, -13.1960f, 5.7970f, 137, -1}, {40, 0, 3007, -7.6610f, 6.0700f, 133, -1}}
-#define MAP_NEXT {{0, 3011, -1.0730f, 6.4850f, 180.0000f, 407, -1.0730f, 6.1870f, 1, -1}, {17, 3042, -5.2607f, 5.8454f, 90.0000f, 409, -5.5969f, 6.0434f, 2, 16}, {25, 3011, -1.0730f, 7.2500f, 0.0000f, 406, -1.0930f, 7.9120f, 1, -1}, {41, 3011, -4.5300f, 5.8450f, -90.0000f, 407, -4.1075f, 6.0470f, 0, 6}}
-#define MAP_NAMES {{0, -1, 405, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 406, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 407, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {1, 21, 410, 3.4800f, 5.6971f, 0xB5DCFB, 1, 0}, {2, -1, 409, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}
+#define MAP_NEXT {{0, 3011, -1.0730f, 6.4850f, 180.0000f, 408, -1.0730f, 6.1870f, 1, -1}, {17, 3042, -5.2607f, 5.8454f, 90.0000f, 410, -5.5969f, 6.0434f, 2, 16}, {25, 3011, -1.0730f, 7.2500f, 0.0000f, 407, -1.0930f, 7.9120f, 1, -1}, {41, 3011, -4.5300f, 5.8450f, -90.0000f, 408, -4.1075f, 6.0470f, 0, 6}}
+#define MAP_NAMES {{0, -1, 406, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 407, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 408, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {1, 21, 411, 3.4800f, 5.6971f, 0xB5DCFB, 1, 0}, {2, -1, 410, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}
#define MAP_QUICK_K 1.5500f
#define MAP_SHADE {{3086, 0.0055f, -0.0110f, 178}, {3087, 0.0000f, 0.0000f, 255}}
#define MAP_MARKERS {3088, 3089, 3090, 3091}
@@ -1267,14 +1269,14 @@
#define MAP_TITLE {0.0000f, 7.5363f}
#define MAP_TITLE_BACK {3092, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}
#define MAP_NO_MAP {3093, 0.0000f, 0.9400f}
-#define MAP_NO_MAP_MSG {413, -0.0600f, -1.2932f}
-#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 414, 3094, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}
+#define MAP_NO_MAP_MSG {414, -0.0600f, -1.2932f}
+#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 415, 3094, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}
#define MAP_MSG_K 0.7000f
#define FIRSTMAP_BG_A 0.6410f
-#define FIRSTMAP_TEXTS {{415, 0.0000f, 5.0305f}, {182, 0.0000f, -0.8796f}, {416, 0.0000f, -3.2895f}, {417, 0.0000f, -4.6996f}}
+#define FIRSTMAP_TEXTS {{416, 0.0000f, 5.0305f}, {182, 0.0000f, -0.8796f}, {417, 0.0000f, -3.2895f}, {418, 0.0000f, -4.6996f}}
#define FIRSTMAP_PIECES {{3095, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3096, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3097, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}
-#define FIRSTMAP_KEY {418, 0.0900f, -2.3200f}
-#define MAP_WIDE {{{3098, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 419, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3099, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 420, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3100, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 421, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}}
+#define FIRSTMAP_KEY {419, 0.0900f, -2.3200f}
+#define MAP_WIDE {{{3098, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 420, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3099, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 421, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3100, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 422, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}}
#define MAP_WIDE_GREY 0x5C
#define MAP_WIDE_NAME_GREY 0x5B
#define MAP_WIDE_COMPASS_K 0.8700f
@@ -1282,14 +1284,14 @@
#define MAP_PAN {-1.4400f, 4.5500f, -8.6420f, -5.5800f}
#define MAP_PAN_SPEED 8.0000f
#define MAP_PAN_ARROWS {{3101, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3101, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3101, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3101, 17.1900f, -7.1700f, 1.0f, -90.0000f}}
-#define MAP_ACT_CONFIRM {{3102, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {422, 423, 423}}
-#define MAP_ACT_MARKER {{3102, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {424, 425, 426}}
-#define MAP_ACT_CANCEL {{3102, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {338, 338, 338}}
-#define MAP_ACT_CHANGE {{3102, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {427, 427, 427}}
-#define MAP_ACT_KEY {{3102, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {428, 429, 430}}
+#define MAP_ACT_CONFIRM {{3102, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {423, 424, 424}}
+#define MAP_ACT_MARKER {{3102, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {425, 426, 427}}
+#define MAP_ACT_CANCEL {{3102, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {339, 339, 339}}
+#define MAP_ACT_CHANGE {{3102, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {428, 428, 428}}
+#define MAP_ACT_KEY {{3102, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {429, 430, 431}}
#define MAP_KEY_BB {3103, 13.6200f, 3.4200f, 0.3781f, 1.0000f}
#define MAP_KEY_STEP -0.8250f
-#define MAP_KEY_ROWS {{{3104, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 431, {12.7550f, -1.5413f, 15.3500f}}, {{3105, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 432, {12.7550f, -1.5413f, 15.3500f}}, {{3106, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 433, {12.7550f, -1.5413f, 15.3500f}}, {{3107, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 434, {12.7550f, -1.5413f, 15.3500f}}, {{3108, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 435, {12.7550f, -1.5413f, 15.3500f}}}
+#define MAP_KEY_ROWS {{{3104, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 432, {12.7550f, -1.5413f, 15.3500f}}, {{3105, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 433, {12.7550f, -1.5413f, 15.3500f}}, {{3106, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 434, {12.7550f, -1.5413f, 15.3500f}}, {{3107, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 435, {12.7550f, -1.5413f, 15.3500f}}, {{3108, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 436, {12.7550f, -1.5413f, 15.3500f}}}
#define MAP_KEY_FLAGS {133, 134, 135, 136, 137}
#define MAP_KEY_N 5
#define MAP_MM_PIECES {{3109, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3110, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3111, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3112, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}
@@ -1299,8 +1301,8 @@
#define MAP_MM_PLACE {3117, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}
#define MAP_MM_RADII 0.8900f
#define MAP_MM_UI_PAUSE 0.2000f
-#define TXT_KEY_SHIFT 436
+#define TXT_KEY_SHIFT 437
#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
-#define SEMI_PERSIST {258, 259, 260, 271, 272, 273}
+#define SEMI_PERSIST {259, 260, 261, 272, 273, 274}
diff --git a/games/hollowknight/src/game.c b/games/hollowknight/src/game.c
index af51c9f5..a887e241 100644
--- a/games/hollowknight/src/game.c
+++ b/games/hollowknight/src/game.c
@@ -70,6 +70,23 @@ bool game_enter(int room, float x, float y, bool facing_right) {
return true;
}
+/* a new game (GameManager.StartNewGame): the room's gate the Knight comes in at, as through it (King's Pass: falling in
+ * from its top) */
+static void scene_load(void);
+bool game_enter_gate(int room, const char *gate) {
+ if (!room_load(room)) return false;
+ int n;
+ const Ent *es = room_ents(&n);
+ for (int i = 0; i < n; i++)
+ if (es[i].type == ENT_GATE && !strcmp(str_at(es[i].s0), gate)) {
+ hero_init(es[i].x0, es[i].y0, true);
+ g_game.next_room = (int16_t)room, g_game.next_entry = es[i].s0, g_game.next_delay = 0;
+ scene_load();
+ return g_room.id == room;
+ }
+ return false;
+}
+
/* HeroController.Respawn, as GameManager starts it: the respawn scene, the Knight at its marker (on the ground below),
* health back, soul gone; on a bench he wakes on it, else on the ground */
bool game_respawn(void) {
@@ -97,6 +114,7 @@ bool game_respawn(void) {
if (g_pd.respawn_type == 1) {
/* (FinishedEnteringScene, then the bench's RESPAWN) */
hero_finished_entering_scene(true);
+ g_pd.disable_pause = false;
if (!bench_respawn(g_pd.respawn_marker)) hero_wake_up_ground();
} else
hero_wake_up_ground();
@@ -307,8 +325,21 @@ static void triggers_tick(void) {
const Ent *e = &es[i];
if (e->type != ENT_CAMLOCK && e->type != ENT_GATE && e->type != ENT_HAZARD_TRIGGER && e->type != ENT_MASK) continue;
bool in = false, off = ent_off[i >> 3] >> (i & 7) & 1;
- for (int j = i; j < n && (j == i || es[j].type == ENT_BOX); j++)
- if (j == i || es[j].flags == 0) in |= x1 > es[j].x0 && x0 < es[j].x1 && y1 > es[j].y0 && y0 < es[j].y1;
+ int j = i + 1;
+ for (; j < n && es[j].type == ENT_BOX; j++)
+ if (es[j].flags == 0) in |= x1 > es[j].x0 && x0 < es[j].x1 && y1 > es[j].y0 && y0 < es[j].y1;
+ if (x1 > e->x0 && x0 < e->x1 && y1 > e->y0 && y0 < e->y1 && !in) {
+ /* (its own collider a polygon, not a box: its outline after, 4 points a record) */
+ float pts[32];
+ int np = 0;
+ for (; j < n && es[j].type == ENT_SHAPE && np < 16; j++) {
+ const Ent *q = &es[j];
+ float v[8] = {q->x0, q->y0, q->x1, q->y1, q->p0, q->p1, q->p2, q->p3};
+ memcpy(pts + 2 * np, v, sizeof v);
+ np += 4;
+ }
+ in = !np || box_meets_polygon(x0, y0, x1, y1, pts, np);
+ }
bool was = inside[i >> 3] >> (i & 7) & 1;
if (off) in = false;
if (in) inside[i >> 3] |= (uint8_t)(1 << (i & 7));
diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.h
index 085d843b..6a1cbee3 100644
--- a/games/hollowknight/src/game.h
+++ b/games/hollowknight/src/game.h
@@ -428,6 +428,7 @@ void fx_dash_burst(float x, float y, bool facing_right, bool on_ground);
void game_new(void);
bool game_enter(int room, float x, float y, bool facing_right);
+bool game_enter_gate(int room, const char *gate); /* (a new game: through its entry gate) */
bool game_respawn(void); /* the Knight at the save's respawn point (a loaded game, after dying) */
void game_tick(uint32_t keys); /* 1/50 s */
void game_draw(void);
diff --git a/games/hollowknight/src/hero.c b/games/hollowknight/src/hero.c
index 5cba14b0..e7600c36 100644
--- a/games/hollowknight/src/hero.c
+++ b/games/hollowknight/src/hero.c
@@ -922,6 +922,26 @@ static const float slash_poly[4][12] = {
-0.7312644f, -1.3820535f, 0.6370943f},
};
+/* the hazards a slash touches that a down slash bounces off (spikes: on the Hero Attack layer), as HB_BOUNCE */
+static int hazards_nail(const float *pts, int npts) {
+ int n;
+ const Ent *es = room_ents(&n);
+ for (int i = 0; i < n; i++) {
+ const Ent *e = &es[i];
+ if (e->type != ENT_DAMAGE || !((int)e->p3 & HB_BOUNCE) || !box_meets_shape(e->x0, e->y0, e->x1, e->y1, pts, npts)) continue;
+ if (!e->a) return HB_BOUNCE;
+ /* (its outline: 4 points a record after it) */
+ float q[16];
+ int nq = (int)e->p2 < 8 ? (int)e->p2 : 8;
+ for (int k = 0; k < nq; k++) {
+ const float *f = &es[i + 1 + k / 4].x0;
+ q[2 * k] = f[2 * (k & 3)], q[2 * k + 1] = f[2 * (k & 3) + 1];
+ }
+ if (shapes_meet(q, nq, pts, npts)) return HB_BOUNCE;
+ }
+ return 0;
+}
+
/* the slash's trigger: what it touches is hit (the damages_enemy FSM), and the Knight recoils or bounces off (NailSlash) */
static void slash_hits(void) {
if (!sl.poly) return;
@@ -935,6 +955,7 @@ static void slash_hits(void) {
}
float direction = sl.kind == SLASH_UP ? 90 : sl.kind == SLASH_DOWN ? 270 : h->cs.facing_right ? 0 : 180;
int fl = obj_nail(pts, 6, direction);
+ if (direction == 270 && !(fl & HB_BOUNCE)) fl |= hazards_nail(pts, 6);
if (direction == 0 && (fl & HB_RECOIL)) hero_recoil_left();
else if (direction == 180 && (fl & HB_RECOIL)) hero_recoil_right();
else if (direction == 90 && (fl & HB_RECOIL)) hero_recoil_down();
@@ -1347,6 +1368,9 @@ void hero_hazard_respawn(void) {
/* HeroController.Respawn's end, the Knight not on a bench: he wakes up on the ground (Wake Up Ground), then has control */
void hero_wake_up_ground(void) {
Hero *h = &g_hero;
+ g_pd.disable_pause = true;
+ reset_input(); /* (IgnoreInput) */
+ h->accepting_input = false;
anim_play_from_frame(&h->anim, CLIP_KNIGHT_WAKE_UP_GROUND, 0);
h->anim_control = false;
h->control_relinquished = true;
@@ -1383,6 +1407,7 @@ static void respawn_tick(void) {
h->anim_state = h->state;
h->control_relinquished = false;
hero_finished_entering_scene(true);
+ g_pd.disable_pause = false;
}
if (!h->respawning) return;
h->respawn_timer -= DT;
@@ -1490,6 +1515,13 @@ void hero_charm_update(void) { hero_max_health(); }
void hero_regain_control(void) {
Hero *h = &g_hero;
+ /* (not while he dies or comes back from a hazard, as King's Pass's tablets would have it on any hit: those give
+ * control back themselves) */
+ if (h->cs.dead || h->wake_timer > 0) return;
+ if (h->cs.hazard_death || h->cs.hazard_respawning) {
+ h->control_relinquished = false;
+ return;
+ }
h->accepting_input = true;
h->state = HS_IDLE;
if (!h->control_relinquished || h->cs.dead) return;
@@ -1506,6 +1538,7 @@ void hero_stop_anim_control(void) { g_hero.anim_control = false; }
void hero_start_anim_control(void) {
Hero *h = &g_hero;
+ if (h->cs.dead || h->cs.hazard_death || h->cs.hazard_respawning || h->wake_timer > 0) return; /* (as above) */
h->anim_state = h->state;
if (!h->anim_control) {
h->anim_control = true;
diff --git a/games/hollowknight/src/hk.h b/games/hollowknight/src/hk.h
index e816afad..91a0dcbe 100644
--- a/games/hollowknight/src/hk.h
+++ b/games/hollowknight/src/hk.h
@@ -198,6 +198,8 @@ void phys_collider_shift(int col, float dx, float dy); /* (moved with its obje
void phys_colliders_reset(void); /* all on (a room starts) */
/* a box and a convex polygon (n points, x y pairs): do they overlap? */
bool box_meets_shape(float x0, float y0, float x1, float y1, const float *pts, int n);
+bool shapes_meet(const float *a, int na, const float *b, int nb); /* (two convex polygons) */
+bool box_meets_polygon(float x0, float y0, float x1, float y1, const float *pts, int n); /* (concave too) */
enum { EV_ENTER, EV_STAY, EV_EXIT };
typedef struct {
diff --git a/games/hollowknight/src/menu.c b/games/hollowknight/src/menu.c
index b457fd8d..e51788b8 100644
--- a/games/hollowknight/src/menu.c
+++ b/games/hollowknight/src/menu.c
@@ -26,7 +26,7 @@ static const int16_t key_texts[MENU_NKEYS][2] = MENU_KEYS; /* (what a key does
static const ZonePiece zone_bgs[MENU_SLOT_NZONES] = MENU_SLOT_ZONES;
static const int16_t zone_texts[MENU_SLOT_NZONES] = TXT_ZONES;
-enum { MS_TITLE, MS_PROFILES, MS_GAME, MS_PAUSE, MS_HELP };
+enum { MS_TITLE, MS_PROFILES, MS_GAME, MS_PAUSE, MS_HELP, MS_LOADING };
/* (the save profiles' rows: the slots, then Back; a slot's Clear Save, its prompt's Yes and No) */
enum { PS_SLOT, PS_CLEAR, PS_PROMPT_NO, PS_PROMPT_YES };
@@ -38,7 +38,7 @@ static struct {
int8_t state[SAVE_SLOTS]; /* (save_stats: 0 none, 1 a game, -1 corrupted) */
SaveStats stats[SAVE_SLOTS];
char num[SAVE_SLOTS][3], geo[SAVE_SLOTS][12], time[SAVE_SLOTS][16];
- bool quit;
+ bool quit, fresh; /* (loading: a new game) */
} mn;
/* a number's digits at p (at least `width`, zero padded) -> past them */
@@ -83,10 +83,16 @@ bool menu_in_game(void) {
return mn.screen == MS_GAME || mn.screen == MS_PAUSE || (mn.screen == MS_HELP && mn.from == MS_PAUSE);
}
-/* a new game in a slot: the Knight at King's Pass' respawn point */
+/* a new game in a slot: the Knight falling into King's Pass from its top (the opening's entry gate, top1); else at its
+ * respawn point */
static void new_game(int slot) {
game_new();
save_select(slot);
+ if (game_enter_gate(ROOM_TUTORIAL_01, "top1")) {
+ g_game.fade = 1, g_screen_fade = 255; /* (from black) */
+ game_fade_scene_in();
+ return;
+ }
room_load(ROOM_TUTORIAL_01);
int n;
const Ent *e = room_ents(&n);
@@ -109,17 +115,28 @@ static void help_close(void) { /* (back where it was opened, on its How to Pla
/* (a slot chosen: its game loaded, at its bench; or a new one) */
static void pick_slot(int slot) {
if (mn.state[slot] == 1) {
- game_new();
- if (!save_load(slot) || !game_respawn()) {
- /* (a file that does not load after all: shown as corrupted) */
- mn.state[slot] = -1;
- return;
- }
- } else if (mn.state[slot] == 0) {
+ /* (the slot says Loading..., the screen fades out, then the game loads) */
+ mn.screen = MS_LOADING, mn.fresh = false, mn.slot = (uint8_t)slot, mn.t = 0;
+ } else if (mn.state[slot] == 0)
help_open(MS_PROFILES, slot); /* (how to play first) */
+ /* (a corrupted save: only cleared) */
+}
+
+/* the screen faded out: the game loads (a new one from how to play, or the slot's) */
+static void load_game(void) {
+ int slot = mn.slot;
+ if (mn.fresh) {
+ new_game(slot);
+ go(MS_GAME, 0);
return;
- } else
- return; /* (a corrupted save: only cleared) */
+ }
+ game_new();
+ if (!save_load(slot) || !game_respawn()) {
+ /* (a file that does not load after all: shown as corrupted) */
+ go(MS_PROFILES, slot);
+ mn.state[slot] = -1;
+ return;
+ }
go(MS_GAME, 0);
}
@@ -177,10 +194,14 @@ bool menu_tick(uint32_t keys) {
else if (mn.page == 0 && (p & (K_OK | K_RIGHT))) mn.page = 1;
else if (mn.page == 1 && (p & K_LEFT)) mn.page = 0;
else if (mn.page == 1 && (p & K_OK)) {
- if (mn.from == MS_PROFILES) new_game(mn.slot), go(MS_GAME, 0);
+ if (mn.from == MS_PROFILES) mn.screen = MS_LOADING, mn.fresh = true, mn.t = 0;
else help_close();
}
return true;
+ case MS_LOADING:
+ /* (drawn once faded: then the load, the screen as it was meanwhile) */
+ if (mn.t > FADE_TIME + DT) load_game();
+ return true;
case MS_PAUSE:
/* Continue, How to Play, Quit to Menu */
if (p & K_UP) mn.sel = (uint8_t)((mn.sel + 2) % 3);
@@ -288,7 +309,7 @@ static void draw_slot(int i, float a) {
/* how to play: the keys (two columns: what a key does, the key), or the basics; under them Next, then Start Game (a
* new game) or Back */
-static void draw_help(float a) {
+static void draw_help(float a, bool loading) {
float hw = VIEW_W / 2 / HUD_PX - 0.6f; /* (the columns: from the screen's edges to its middle) */
text_id(STYLE_MENU_TITLE, mn.page ? TXT_HELP_TITLE : TXT_SCREEN_KEYBOARD, 0, MENU_KEYS_TITLE_Y, 0, a);
piece(&keys_fleur, 0, MENU_KEYS_FLEUR_Y, false, white(0, a));
@@ -311,7 +332,10 @@ static void draw_help(float a) {
y -= line;
}
}
- button(mn.page == 0 ? TXT_NEXT : mn.from == MS_PROFILES ? TXT_MAIN_START : TXT_NAV_BACK, 0, MENU_KEYS_BUTTON_Y, true, a);
+ if (loading)
+ text_id(STYLE_MENU, TXT_PROFILE_LOADING, 0, MENU_KEYS_BUTTON_Y, 0, 1); /* (in its button's place) */
+ else
+ button(mn.page == 0 ? TXT_NEXT : mn.from == MS_PROFILES ? TXT_MAIN_START : TXT_NAV_BACK, 0, MENU_KEYS_BUTTON_Y, true, a);
}
void menu_draw(void) {
@@ -341,7 +365,24 @@ void menu_draw(void) {
break;
case MS_HELP:
if (mn.from == MS_PAUSE) gfx_hud_fill(-15, -9, 15, 9, gfx_dyn_tint(31, 0, 0, 0, (uint8_t)(0.8f * 255 + 0.5f)));
- draw_help(a);
+ draw_help(a, false);
break;
+ case MS_LOADING: {
+ /* what was there fading out, Loading... where it was chosen (LoadingGameText) */
+ float out = 1 - a;
+ if (mn.fresh) {
+ draw_help(out, true);
+ break;
+ }
+ text_id(STYLE_MENU_TITLE, TXT_SCREEN_SAVE_PROFILES, 0, MENU_PROFILES_TITLE_Y, 0, out);
+ piece(&profiles_fleur, 0, MENU_PROFILES_FLEUR_Y, false, white(0, out));
+ for (int i = 0; i < SAVE_SLOTS; i++)
+ if (i == mn.slot)
+ text_id(STYLE_MENU, TXT_PROFILE_LOADING, MENU_SLOT_X + MENU_SLOT_NEW_X, MENU_SLOT_Y + i * MENU_SLOT_DY, 1, 1);
+ else
+ draw_slot(i, out);
+ button(TXT_NAV_BACK, 0, MENU_BACK_Y, false, out);
+ break;
+ }
}
}
diff --git a/games/hollowknight/src/phys.c b/games/hollowknight/src/phys.c
index 2c090706..af9b7380 100644
--- a/games/hollowknight/src/phys.c
+++ b/games/hollowknight/src/phys.c
@@ -365,6 +365,29 @@ void body_step(Body *b, float dt) {
for (int j = 0; j < n; j++) b->ccol[j] = cols[j], b->cnx[j] = nxs[j], b->cny[j] = nys[j];
}
+/* two convex polygons (na, nb points): do they overlap (separating axes)? */
+static bool apart_on_edges(const float *a, int na, const float *b, int nb) {
+ for (int i = 0; i < na; i++) {
+ float nx = -(a[2 * ((i + 1) % na) + 1] - a[2 * i + 1]), ny = a[2 * ((i + 1) % na)] - a[2 * i];
+ if (nx == 0 && ny == 0) continue;
+ float amin = 1e30f, amax = -1e30f, bmin = 1e30f, bmax = -1e30f;
+ for (int j = 0; j < na; j++) {
+ float d = a[2 * j] * nx + a[2 * j + 1] * ny;
+ amin = fminf(amin, d), amax = fmaxf(amax, d);
+ }
+ for (int j = 0; j < nb; j++) {
+ float d = b[2 * j] * nx + b[2 * j + 1] * ny;
+ bmin = fminf(bmin, d), bmax = fmaxf(bmax, d);
+ }
+ if (bmax < amin || bmin > amax) return true;
+ }
+ return false;
+}
+bool shapes_meet(const float *a, int na, const float *b, int nb) {
+ if (na < 3 || nb < 3) return true;
+ return !apart_on_edges(a, na, b, nb) && !apart_on_edges(b, nb, a, na);
+}
+
/* a box (x0, y0, x1, y1) and a convex polygon of n points: do they overlap (separating axes)? */
bool box_meets_shape(float x0, float y0, float x1, float y1, const float *pts, int n) {
if (n < 3) return true;
@@ -390,3 +413,30 @@ bool box_meets_shape(float x0, float y0, float x1, float y1, const float *pts, i
}
return !(px1 < x0 || px0 > x1 || py1 < y0 || py0 > y1);
}
+
+/* a box and any polygon of n points (a trigger's, concave or not): an edge across the box, or the box inside */
+bool box_meets_polygon(float x0, float y0, float x1, float y1, const float *pts, int n) {
+ if (n < 3) return true;
+ float cx = (x0 + x1) / 2, cy = (y0 + y1) / 2;
+ bool in = false;
+ for (int i = 0, k = n - 1; i < n; k = i++) {
+ float ax = pts[2 * k], ay = pts[2 * k + 1], bx = pts[2 * i], by = pts[2 * i + 1];
+ if ((ay > cy) != (by > cy) && cx < ax + (cy - ay) * (bx - ax) / (by - ay)) in = !in;
+ /* (the edge against the box: clipped to it, Liang-Barsky) */
+ float t0 = 0, t1 = 1, dx = bx - ax, dy = by - ay;
+ float q[4] = {ax - x0, x1 - ax, ay - y0, y1 - ay}, pp[4] = {-dx, dx, -dy, dy};
+ bool cut = true;
+ for (int e = 0; e < 4 && cut; e++) {
+ if (pp[e] == 0) {
+ if (q[e] < 0) cut = false;
+ } else {
+ float t = q[e] / pp[e];
+ if (pp[e] < 0) t0 = t > t0 ? t : t0;
+ else t1 = t < t1 ? t : t1;
+ if (t0 > t1) cut = false;
+ }
+ }
+ if (cut) return true;
+ }
+ return in;
+}
diff --git a/games/hollowknight/tools/actors.py b/games/hollowknight/tools/actors.py
index bd155067..6d507989 100644
--- a/games/hollowknight/tools/actors.py
+++ b/games/hollowknight/tools/actors.py
@@ -20,7 +20,7 @@ KNIGHT = ("resources.assets", 20600, [
"Prostrate", "Prostrate Rise", "Wake Up Ground", "Collect Normal 1", "Collect Normal 2", "Collect Normal 3",
"Collect Magical 1", "Collect Magical 2", "Collect Magical 3", "Collect Magical Fall", "Collect Magical Land",
"Collect Heart Piece", "Collect Heart Piece End", "Collect StandToIdle", "GetUpToIdle", "Death Head Cracked",
- "Dreamer Land",
+ "Dreamer Land", "Super Hard Land",
])
# enemy kinds: name, the FSM (or component) that runs them, their library, the C code for that FSM, and the clips each
diff --git a/games/hollowknight/tools/ents.py b/games/hollowknight/tools/ents.py
index 3928ce6a..a9f80bcc 100644
--- a/games/hollowknight/tools/ents.py
+++ b/games/hollowknight/tools/ents.py
@@ -229,6 +229,21 @@ def _more_boxes(o):
return [rec(ENT_BOX, box=b) for b in _triggers(o)[1:]]
+def _outline(o):
+ """After a trigger's record and the boxes that follow it: its own collider's outline when that is a polygon, not a
+ box (ENT_SHAPE: 4 points a record, the last repeated; src/game.c: triggers_tick)."""
+ c = next((c for c in o["c"] if c["type"] in ("BoxCollider2D", "PolygonCollider2D", "CircleCollider2D") and
+ c.get("v") and c["v"].get("m_IsTrigger") and c["v"].get("m_Enabled", 1)), None)
+ pts = _shape(o, c) if c is not None and c["type"] == "PolygonCollider2D" else None
+ out = []
+ if pts and not _is_axis_box(pts):
+ assert len(pts) <= 16, o["path"]
+ for i in range(0, len(pts), 4):
+ q = pts[i:i + 4] + [pts[-1]] * (4 - len(pts[i:i + 4]))
+ out.append(rec(ENT_SHAPE, box=(q[0][0], q[0][1], q[1][0], q[1][1]), p=(q[2][0], q[2][1], q[3][0], q[3][1])))
+ return out
+
+
def rec(type_, flags=0, box=(0, 0, 0, 0), p=(0, 0, 0, 0), a=0, group=0, group2=0, persist=NO_PERSIST, s0=0, s1=0):
return struct.pack(REC, type_, flags, group, group2, a, persist, *box, *p, s0, s1)
@@ -865,7 +880,7 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0
import vm
recs.append(rec(ENT_MASK, kind, box, (fade, pause, p2, p3), group=g, group2=g2,
persist=persist.id(name, o["path"]) if persistent else NO_PERSIST, s1=vm.STR.id(o["name"])))
- recs += _more_boxes(o)
+ recs += _more_boxes(o) + _outline(o)
classes = {c.get("class") for c in o["c"]}
f = _fsm(o, ("Bench Control",))
if f:
@@ -1112,9 +1127,13 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0
recs += [rec(ENT_BOX, fl, box=b) for b, fl in hits]
recs += pieces
dh = [c for c in o["c"] if c.get("class") == "DamageHero"]
- if dh and not classes & {"HealthManager", "StalactiteControl"}:
- # a hazard (spikes, acid): its colliders' outlines, as boxes or as shapes after it
+ # (its own classes: o may be an enemy found under its ActivateChildrenOnContact parent, whose touch is its own)
+ if dh and not {c.get("class") for c in o["c"]} & {"HealthManager", "StalactiteControl"}:
+ # a hazard (spikes, acid): its colliders' outlines, as boxes or as shapes after it; p3: a down slash bounces
+ # off it (NailSlash: the layers it bounces off, no NonBouncer on)
v = dh[0].get("v") or {}
+ nb = any(c.get("class") == "NonBouncer" and (c.get("v") or {}).get("active", True) for c in o["c"])
+ bounce = HB_BOUNCE if o["layer"] in (11, 17, 19) and not nb else 0
for c in o["c"]:
if c["type"] not in ("BoxCollider2D", "PolygonCollider2D") or not c.get("v") or not c["v"].get("m_Enabled", 1):
continue
@@ -1124,11 +1143,12 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0
xs, ys = [q[0] for q in pts], [q[1] for q in pts]
box = (min(xs), min(ys), max(xs), max(ys))
if _is_axis_box(pts):
- recs.append(rec(ENT_DAMAGE, box=box, p=(v.get("hazardType", 1), v.get("damageDealt", 1), 0, 0)))
+ recs.append(rec(ENT_DAMAGE, box=box, p=(v.get("hazardType", 1), v.get("damageDealt", 1), 0, bounce)))
else:
pts = pts[:8]
nrec = (len(pts) + 3) // 4
- recs.append(rec(ENT_DAMAGE, box=box, p=(v.get("hazardType", 1), v.get("damageDealt", 1), len(pts), 0), a=nrec))
+ recs.append(rec(ENT_DAMAGE, box=box, p=(v.get("hazardType", 1), v.get("damageDealt", 1), len(pts), bounce),
+ a=nrec))
for i in range(nrec):
q = pts[4 * i:4 * i + 4] + [pts[-1]] * (4 - len(pts[4 * i:4 * i + 4]))
recs.append(rec(ENT_SHAPE, box=(q[0][0], q[0][1], q[1][0], q[1][1]), p=(q[2][0], q[2][1], q[3][0], q[3][1])))
@@ -1150,7 +1170,7 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0
vo = vo if vo is not None and rmv.objs[vo]["path"] == o["path"] and rmv.objs[vo].get("_scene") == name else None
recs.append(rec(ENT_CAMLOCK, fl, box, (v["cameraXMin"], v["cameraYMin"], v["cameraXMax"], v["cameraYMax"]),
a=vo + 1 if vo is not None else 0, s1=nm))
- recs += _more_boxes(o)
+ recs += _more_boxes(o) + _outline(o)
elif cls == "TransitionPoint":
box, entry_only = _trigger(o), 0
if box is None:
@@ -1190,6 +1210,7 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0
1 if fv("Over Hero") else 0),
(float(fv("Entry Pause", 0) or 0), DOOR_PROMPTS.index(fv("Prompt Name", "Enter")), 0, 0),
a=rooms.index(to) if to in rooms else 0xFFFF, s1=strings.id(fv("Entry Gate") or "")))
+ recs += _outline(o)
elif cls == "HazardRespawnTrigger":
box = _trigger(o)
ref = v.get("respawnMarker")
@@ -1203,7 +1224,7 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0
if box is None or target not in marker_index:
continue
recs.append(rec(ENT_HAZARD_TRIGGER, box=box, a=marker_index[target] + rec_base))
- recs += _more_boxes(o)
+ recs += _more_boxes(o) + _outline(o)
# (arenas: their camera locks' records)
for i, c1, c2 in battles:
b = bytearray(recs[i])
diff --git a/games/hollowknight/tools/menu.py b/games/hollowknight/tools/menu.py
index ac8bbe0c..adb2be19 100644
--- a/games/hollowknight/tools/menu.py
+++ b/games/hollowknight/tools/menu.py
@@ -193,7 +193,7 @@ def build(sprites, texts):
sh = text.sheets()
mm = lambda k, st="MENU": texts.add(text.clean(sh["MainMenu"][k]), st)
for k in ("MAIN_START", "MAIN_QUIT", "PROFILE_NEW_GAME", "PROFILE_CLEAR_BUTTON", "PROFILE_CLEAR_PROMPT", "NAV_YES",
- "NAV_NO", "NAV_BACK", "PAUSE_CONTINUE", "PAUSE_MAIN", "PROFILE_CORRUPTED"):
+ "NAV_NO", "NAV_BACK", "PAUSE_CONTINUE", "PAUSE_MAIN", "PROFILE_CORRUPTED", "PROFILE_LOADING"):
out["TXT_" + k] = mm(k)
out["TXT_SCREEN_SAVE_PROFILES"] = mm("SCREEN_SAVE_PROFILES", "MENU_TITLE")
out["TXT_SCREEN_KEYBOARD"] = mm("SCREEN_KEYBOARD", "MENU_TITLE")
diff --git a/games/hollowknight/tools/state.py b/games/hollowknight/tools/state.py
index 496c7612..77500a60 100644
--- a/games/hollowknight/tools/state.py
+++ b/games/hollowknight/tools/state.py
@@ -7,6 +7,9 @@ CONSTANT = {"crossroadsInfected": False, "troupeInTown": False, "clothInTown": F
"clothKilled": False, "clothLeftTown": False, "brettaLeftTown": False, "zoteDefeated": False,
"brettaRescued": False, "visitedRuins": False, "visitedDeepnest": False, "colosseumSilverOpened": False,
"nymmInTown": False, "killedGrimm": False, "divineInTown": False, "fatGrubKing": False}
+# (the Grimm Troupe's: none of it comes this early)
+CONSTANT.update({"defeatedNightmareGrimm": False, "equippedCharm_40": False, "gotCharm_40": False})
+CONSTANT_INTS = {"flamesCollected": 0, "flamesRequired": 3, "grimmChildLevel": 1}
DYNAMIC = {"visitedDirtmouth", "tisoEncounteredTown", "hasDash", "hornet1Defeated", "shamanPillar", "openedTownBuilding",
"slyRescued", "openedMapperShop"}
@@ -35,6 +38,104 @@ def _check_opened(o, by):
q["_conds"] = [(name, q["name"] == "closed")]
+# (actions that wait: their state finishes later, by FINISHED)
+_WAITS = {"Wait", "NextFrameEvent", "WaitForHeroInPosition", "WaitForFinishedEnteringScene"}
+
+
+def _event(v):
+ return v[1] if isinstance(v, (list, tuple)) and len(v) == 2 and v[0] == "event" else None
+
+
+def scripted_off(o):
+ """What an object's own scripts turn off as its scene starts, whatever the Knight does, from the constant bools
+ (a PlayerData bool test, then ActivateGameObject or ActivateAllChildren on itself, or DestroySelf, as the Grimm
+ Troupe's tents and Flamebearers have it): "self", "children" or None. Followed while each step is certain; its
+ children off only if the script then rests where nothing else can come."""
+ out = None
+ for c in o["c"]:
+ f = c.get("fsm")
+ if not f or not c.get("enabled", True):
+ continue
+ vars_ = {k: v[1] for k, v in (f.get("vars") or {}).items()}
+ states = {st["name"]: st for st in f["states"]}
+
+ def val(v):
+ return vars_.get(v[1:]) if isinstance(v, str) and v.startswith("$") else v
+
+ def me(v):
+ return v == "Owner" or (isinstance(v, str) and v.startswith("$") and vars_.get(v[1:]) == "<self>")
+ st, seen, children_off = states.get(f["start"]), set(), False
+ while st is not None and st["name"] not in seen:
+ seen.add(st["name"])
+ ev, stop = None, False
+ for a in st["actions"]:
+ n, P = a["name"], dict(a.get("params") or [])
+ if n == "GetOwner":
+ vars_[str(P.get("storeGameObject", ""))[1:]] = "<self>"
+ elif n == "SetBoolValue":
+ vars_[str(P.get("boolVariable", ""))[1:]] = P.get("boolValue")
+ elif n == "GetPlayerDataInt":
+ name = val(P.get("intName"))
+ if name not in CONSTANT_INTS:
+ stop = True
+ break
+ vars_[str(P.get("storeValue", ""))[1:]] = CONSTANT_INTS[name]
+ elif n == "PlayerDataBoolTest":
+ name = val(P.get("boolName"))
+ if name not in CONSTANT:
+ stop = True
+ break
+ ev = _event(P.get("isTrue" if CONSTANT[name] else "isFalse"))
+ elif n == "PlayerDataBoolTrueAndFalse":
+ t, fb = val(P.get("trueBool")), val(P.get("falseBool"))
+ if CONSTANT.get(t) is False or CONSTANT.get(fb) is True:
+ ev = _event(P.get("isFalse"))
+ elif t in CONSTANT and fb in CONSTANT:
+ ev = _event(P.get("isTrue"))
+ else:
+ stop = True
+ break
+ elif n == "BoolTest":
+ v = val(P.get("boolVariable"))
+ if not isinstance(v, bool) or P.get("everyFrame"):
+ stop = True
+ break
+ ev = _event(P.get("isTrue" if v else "isFalse"))
+ elif n == "IntCompare":
+ a1, a2 = val(P.get("integer1")), val(P.get("integer2"))
+ if not isinstance(a1, int) or not isinstance(a2, int) or P.get("everyFrame"):
+ stop = True
+ break
+ ev = _event(P.get("equal" if a1 == a2 else "lessThan" if a1 < a2 else "greaterThan"))
+ elif n == "DestroySelf" or (n == "ActivateGameObject" and me(P.get("gameObject")) and
+ P.get("activate") is False):
+ return "self"
+ elif n == "ActivateAllChildren" and me(P.get("gameObject")):
+ children_off = P.get("activate") is False
+ elif n in _WAITS:
+ if n == "Wait" and not (isinstance(P.get("time"), (int, float)) and P["time"] <= 0.5):
+ stop = True # (on for a while first: as it is)
+ break
+ elif any(_event(v) for v in P.values()):
+ stop = True # (an event this does not follow)
+ break
+ if ev:
+ break
+ if stop:
+ break
+ if ev is None:
+ ev = "FINISHED"
+ to = next((t for e, t in st.get("transitions") or [] if e == ev), None)
+ if to is None:
+ # (at rest: its other events only its own tests send)
+ own = {_event(v) for a in st["actions"] for v in dict(a.get("params") or []).values()}
+ if children_off and all(e in own for e, _ in st.get("transitions") or []):
+ out = "children"
+ break
+ st = states.get(to)
+ return out
+
+
def apply(d):
"""Turns off (with what is under them) the scene's objects that the constant bools turn off."""
by = {o["id"]: o for o in d["objects"]}
@@ -51,4 +152,14 @@ def apply(d):
todo += q.get("children", [])
elif name not in DYNAMIC:
print("state: %s: %s not known" % (o["path"], name))
+ for o in d["objects"]:
+ if not o["active"]:
+ continue
+ off = scripted_off(o)
+ if off:
+ todo = [o["id"]] if off == "self" else list(o.get("children", []))
+ while todo:
+ q = by[todo.pop()]
+ q["active"] = False
+ todo += q.get("children", [])
return d
diff --git a/games/hollowknight/tools/visible.py b/games/hollowknight/tools/visible.py
index eca5cbe7..0ad78d56 100644
--- a/games/hollowknight/tools/visible.py
+++ b/games/hollowknight/tools/visible.py
@@ -83,12 +83,25 @@ def view(args):
return seen
+VERSION = 2 # (bumped when what a view sees changes, beyond the instances themselves)
+
+
+def signature(inst):
+ """the instances the results are for, in order (the cells are each one's): stale results are made again"""
+ import zlib
+ return np.array([zlib.crc32(repr((VERSION, it.obj["id"], it.sprite.key, round(it.sprite.w), round(it.sprite.h),
+ getattr(it.sprite, "tight", None), round(it.color[3], 4))).encode())
+ for it in inst], np.uint32)
+
+
def compute(name):
p = os.path.join(unity.CACHE, name + ".vis.npz")
+ inst = scene.instances(name)
+ sig = signature(inst)
if os.path.exists(p):
z = np.load(p, allow_pickle=True)
- return z["weight"], z["cells"].item()
- inst = scene.instances(name)
+ if "sig" in z.files and np.array_equal(z["sig"], sig):
+ return z["weight"], z["cells"].item()
st = scene.settings(unity.scene(name))
if st["size"] is None:
n = len(inst)
@@ -107,7 +120,7 @@ def compute(name):
weight[i] = max(weight[i], wsum)
cells.setdefault(i, set()).update(c.tolist())
cells = {i: np.array(sorted(c), np.int32) for i, c in cells.items()}
- np.savez_compressed(p, weight=weight, cells=np.array(cells, dtype=object))
+ np.savez_compressed(p, weight=weight, cells=np.array(cells, dtype=object), sig=sig)
print("visible", name, len(jobs), "views:", int((weight >= 0.5).sum()), "of", len(inst), "instances show", flush=True)
return weight, cells
diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.py
index 6a8b8358..158c3dd0 100644
--- a/games/hollowknight/tools/vm.py
+++ b/games/hollowknight/tools/vm.py
@@ -30,7 +30,7 @@ ROOMS = {
"Crossroads_01": ["Shiny Item", "Force Hard Landing", "_Scenery/sign_post_03/Crossroads Sign Post"],
"Tutorial_01": ["_Props/Chest/Item", "_Props/Collapser Tute 01", "_Scenery/Break Floor 1", "Interact Reminder",
"_Props/Tute Door 5/Active/Jump Reminder", "_Props/Tut_tablet_top", "_Props/Tut_tablet_top (1)",
- "_Props/Tut_tablet_top (2)"], # (its chest: src/obj.c, which turns on what is in it)
+ "_Props/Tut_tablet_top (2)", "Initial Fall Impact"], # (its chest: src/obj.c, which turns on what is in it)
"Fungus1_22": ["Shiny Item", "Gate Switch", "Metal Gate", "Breakable Wall"],
# (Fk Break Wall's Escape Checker finds no False Knight: its scene loads after it looks, as SceneLoad's LoadBoss)
"Crossroads_10": ["Key Giver", "Breakable Wall", "Fk Break Wall"],
@@ -557,6 +557,11 @@ class Room:
sr = next(c.get("v") for c in q["c"])
if not sr or not sr.get("m_Sprite") or not sr.get("m_Enabled", 1):
return False
+ # (its parent's own script destroying its children, as a collapsing floor does: each its own object, to go)
+ p = self.by_id.get(q.get("parent"))
+ if p is not None and any(a["name"] == "DestroyAllChildren" for c in p["c"] if c.get("fsm")
+ for st in c["fsm"]["states"] for a in st["actions"]):
+ return False
names, ids = self.referenced()
return q["name"] not in names and q.get("_raw", q["id"]) not in ids and not any(c.get("pid") in ids for c in q["c"])
diff --git a/tests/test_games.py b/tests/test_games.py
index ba778fcb..81ab653d 100644
--- a/tests/test_games.py
+++ b/tests/test_games.py
@@ -111,11 +111,11 @@ GAMES = {
"celeste": ("Celeste.nwa", "celeste.sav",
presses((2500, "ok"), (4000, "ok"), (5500, "ok"), (7000, "ok"), (8500, "ok"), (11000, "right", 2500)), 15000,
presses((2500, "ok"), (4000, "ok"), (5500, "ok"), (7500, "right", 1500)), 11000),
- # Start Game, the first profile (a new game: past how to play's two pages, the Knight falls into King's Pass), then
- # Home, which saves as Quit to Menu; then the same profile, loaded
+ # Start Game, the first profile (a new game: past how to play's two pages, the Knight falls into King's Pass and
+ # lies there a while), then Home, which saves as Quit to Menu; then the same profile, loaded
"hollowknight": ("HollowKnight.nwa", "hk1.sav",
- presses((2500, "ok"), (4500, "ok"), (5500, "ok"), (6500, "ok")) + every(12000, 16000, 600, "right", 400),
- 20000,
+ presses((2500, "ok"), (4500, "ok"), (5500, "ok"), (6500, "ok")) + every(18000, 22000, 600, "right", 400),
+ 25000,
presses((2500, "ok"), (4500, "ok")) + every(9000, 11000, 600, "left", 400), 14000),
# a level, its message, then play; then back to the level select
"portal": ("PortalReturns.nwa", "portal.sav",