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: stag stations, doors and the Dirtmouth station lift

Mason Chen7c648236e2f3
diff --git a/games/hollowknight/Makefile b/games/hollowknight/Makefile
index e5e5c918..69b44539 100644
--- a/games/hollowknight/Makefile
+++ b/games/hollowknight/Makefile
@@ -9,7 +9,7 @@ CC = arm-none-eabi-gcc
NWLINK ?= npx --yes -- [email protected]
STRIP ?= arm-none-eabi-strip --strip-unneeded
BUILD_DIR = output
-GAME = src/res.c src/tex.c src/room.c src/gfx.c src/phys.c src/anim.c src/hero.c src/camera.c src/game.c src/world.c src/obj.c src/enemy.c src/hud.c src/spell.c src/text.c src/npc.c src/title.c src/vm.c src/msg.c src/save.c src/death.c src/menu.c src/inv.c src/shop.c src/collect.c src/lzma/LzmaDec.c
+GAME = src/res.c src/tex.c src/room.c src/gfx.c src/phys.c src/anim.c src/hero.c src/camera.c src/game.c src/world.c src/obj.c src/enemy.c src/hud.c src/spell.c src/text.c src/npc.c src/title.c src/vm.c src/msg.c src/save.c src/death.c src/menu.c src/inv.c src/shop.c src/collect.c src/stag.c src/lzma/LzmaDec.c
SRC = $(GAME) src/plat_eadk.c src/main.c
HEADERS = $(wildcard src/*.h) ../common/epsilon_app.h ../common/epsilon_files.h
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.bin
index 78bf9d39..9fa46be6 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 08779daa..78411b80 100644
--- a/games/hollowknight/src/data.h
+++ b/games/hollowknight/src/data.h
@@ -208,424 +208,445 @@
#define CLIP_VESSELUI_GET_3 148
#define CLIP_VESSELUI_GOT_1 149
#define CLIP_VESSELUI_GOT_2 150
-#define CLIP_GEOBUG_LAMP_BUG_IDLE 151
-#define CLIP_DIALOGUE_ARROW_UP 152
-#define CLIP_DIALOGUE_ARROW_DOWN 153
-#define CLIP_DIALOGUE_STOP_UP 154
-#define CLIP_DIALOGUE_STOP_DOWN 155
-#define CLIP_DIALOGUE_FLEUR_TOP_UP 156
-#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 157
-#define CLIP_DIALOGUE_FLEUR_BOT_UP 158
-#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 159
-#define CLIP_DIALOGUE_DREAM_UP 160
-#define CLIP_DIALOGUE_DREAM_DOWN 161
-#define CLIP_PROMPT_BLANK 162
-#define CLIP_PROMPT_DOWN 163
-#define CLIP_PROMPT_ENTER_DOWN 164
-#define CLIP_PROMPT_ENTER_IDLE 165
-#define CLIP_PROMPT_ENTER_UP 166
-#define CLIP_PROMPT_IDLE 167
-#define CLIP_PROMPT_LISTEN_DOWN 168
-#define CLIP_PROMPT_LISTEN_IDLE 169
-#define CLIP_PROMPT_LISTEN_UP 170
-#define CLIP_PROMPT_UP 171
-#define CLIP_SHADE_APPEAR 172
-#define CLIP_SHADE_CAST 173
-#define CLIP_SHADE_CAST_ANTIC 174
-#define CLIP_SHADE_CAST_CHARGE 175
-#define CLIP_SHADE_CAST_RING 176
-#define CLIP_SHADE_DEATH 177
-#define CLIP_SHADE_DEATH_GLOW 178
-#define CLIP_SHADE_DEATH_START 179
-#define CLIP_SHADE_DEPART 180
-#define CLIP_SHADE_FIREBALL 181
-#define CLIP_SHADE_FIREBALL_END 182
-#define CLIP_SHADE_FLY 183
-#define CLIP_SHADE_IDLE 184
-#define CLIP_SHADE_RETREAT_END 185
-#define CLIP_SHADE_RETREAT_START 186
-#define CLIP_SHADE_SLASH 187
-#define CLIP_SHADE_SLASH_ANTIC 188
-#define CLIP_SHADE_SLASH_CD 189
-#define CLIP_SHADE_SLASH_EFFECT 190
-#define CLIP_SHADE_STARTLE 191
-#define CLIP_SHADE_TURNTOFLY 192
-#define CLIP_SHADE_TURNTOIDLE 193
-#define CLIP_CRAWLER_WALK 194
-#define CLIP_CRAWLER_TURN 195
-#define CLIP_CRAWLER_IDLE 196
-#define CLIP_CRAWLER_DEATH_AIR 197
-#define CLIP_CRAWLER_DEATH_LAND 198
-#define CLIP_BUZZER_CHASE 199
-#define CLIP_BUZZER_IDLE 200
-#define CLIP_BUZZER_STARTLE 201
-#define CLIP_BUZZER_DEATH_AIR 202
-#define CLIP_BUZZER_DEATH_LAND 203
-#define CLIP_BUZZER_FLY 204
-#define CLIP_BUZZER_TURNTOFLY 205
-#define CLIP_BUZZER_TURNTOIDLE 206
-#define CLIP_TIKTIK_DEATH_AIR 207
-#define CLIP_TIKTIK_DEATH_LAND 208
-#define CLIP_TIKTIK_STUN 209
-#define CLIP_TIKTIK_WALK 210
-#define CLIP_GRUZZER_DEATH_AIR 211
-#define CLIP_GRUZZER_DEATH_LAND 212
-#define CLIP_GRUZZER_FLY 213
-#define CLIP_ASPID_DEATH_AIR 214
-#define CLIP_ASPID_FIRE_LONG 215
-#define CLIP_ASPID_FLY 216
-#define CLIP_ASPID_TURNTOFLY 217
-#define CLIP_BALDUR_DEATH_AIR 218
-#define CLIP_BALDUR_DEATH_LAND 219
-#define CLIP_BALDUR_IDLE 220
-#define CLIP_BALDUR_ROLL 221
-#define CLIP_BALDUR_START 222
-#define CLIP_BALDUR_STOP 223
-#define CLIP_ELDERBALDUR_CLOSE1 224
-#define CLIP_ELDERBALDUR_CLOSE2 225
-#define CLIP_ELDERBALDUR_CLOSED 226
-#define CLIP_ELDERBALDUR_DEATH 227
-#define CLIP_ELDERBALDUR_DEATH_STUN 228
-#define CLIP_ELDERBALDUR_HIT 229
-#define CLIP_ELDERBALDUR_IDLE 230
-#define CLIP_ELDERBALDUR_OPEN 231
-#define CLIP_ELDERBALDUR_SHOOT_ANTIC 232
-#define CLIP_ELDERBALDUR_SHOOT_CD 233
-#define CLIP_HUSK_ATTACK_ANTICIPATE 234
-#define CLIP_HUSK_ATTACK_COOLDOWN 235
-#define CLIP_HUSK_ATTACK_LUNGE 236
-#define CLIP_HUSK_DEATH_AIR 237
-#define CLIP_HUSK_DEATH_LAND 238
-#define CLIP_HUSK_IDLE 239
-#define CLIP_HUSK_TURN 240
-#define CLIP_HUSK_WALK 241
-#define CLIP_BARGER_ATTACK_ANTICIPATE 242
-#define CLIP_BARGER_ATTACK_COOLDOWN 243
-#define CLIP_BARGER_ATTACK_LUNGE 244
-#define CLIP_BARGER_DEATH_AIR 245
-#define CLIP_BARGER_DEATH_LAND 246
-#define CLIP_BARGER_IDLE 247
-#define CLIP_BARGER_TURN 248
-#define CLIP_BARGER_WALK 249
-#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 250
-#define CLIP_HORNHEAD_ATTACK_COOLDOWN 251
-#define CLIP_HORNHEAD_ATTACK_LUNGE 252
-#define CLIP_HORNHEAD_DEATH_AIR 253
-#define CLIP_HORNHEAD_DEATH_LAND 254
-#define CLIP_HORNHEAD_IDLE 255
-#define CLIP_HORNHEAD_TURN 256
-#define CLIP_HORNHEAD_WALK 257
-#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 258
-#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 259
-#define CLIP_MOSSRUNNER_ATTACK_LUNGE 260
-#define CLIP_MOSSRUNNER_DEATH_AIR 261
-#define CLIP_MOSSRUNNER_DEATH_LAND 262
-#define CLIP_MOSSRUNNER_IDLE 263
-#define CLIP_MOSSRUNNER_TURN 264
-#define CLIP_MOSSRUNNER_WALK 265
-#define CLIP_LEAPER_ATTACK 266
-#define CLIP_LEAPER_DEATH_AIR 267
-#define CLIP_LEAPER_DEATH_LAND 268
-#define CLIP_LEAPER_IDLE 269
-#define CLIP_LEAPER_LAND 270
-#define CLIP_LEAPER_TURN 271
-#define CLIP_LEAPER_WALK 272
-#define CLIP_GUARD_ANTICIPATE 273
-#define CLIP_GUARD_ATTACK2 274
-#define CLIP_GUARD_DEATH_AIR 275
-#define CLIP_GUARD_DEATH_LAND 276
-#define CLIP_GUARD_DORMANT 277
-#define CLIP_GUARD_IDLE 278
-#define CLIP_GUARD_RUN 279
-#define CLIP_GUARD_STARTLE 280
-#define CLIP_GUARD_STOMP_ANTIC 281
-#define CLIP_GUARD_STOMP_JUMP 282
-#define CLIP_GUARD_STOMP_LAND 283
-#define CLIP_GUARD_STOP_RUN 284
-#define CLIP_GUARD_STOP_WALK 285
-#define CLIP_GUARD_SWIPE 286
-#define CLIP_GUARD_TURN 287
-#define CLIP_GUARD_WAKE 288
-#define CLIP_GUARD_WALK 289
-#define CLIP_FK_ATTACK 290
-#define CLIP_FK_ATTACK_ANTIC 291
-#define CLIP_FK_ATTACK_RECOVER 292
-#define CLIP_FK_BLANK 293
-#define CLIP_FK_BODY 294
-#define CLIP_FK_DEATH_FALL 295
-#define CLIP_FK_DEATH_HEAD_1 296
-#define CLIP_FK_DEATH_HEAD_2 297
-#define CLIP_FK_DEATH_LAND 298
-#define CLIP_FK_DEATH_SPAZ 299
-#define CLIP_FK_IDLE 300
-#define CLIP_FK_JUMP 301
-#define CLIP_FK_JUMP_ANTIC 302
-#define CLIP_FK_JUMP_ATTACK_HIT_1 303
-#define CLIP_FK_JUMP_ATTACK_HIT_2 304
-#define CLIP_FK_JUMP_ATTACK_HIT_3 305
-#define CLIP_FK_JUMP_ATTACK_UP 306
-#define CLIP_FK_LAND 307
-#define CLIP_FK_RAGE 308
-#define CLIP_FK_RUN 309
-#define CLIP_FK_RUN_ANTIC 310
-#define CLIP_FK_STUN_HIT 311
-#define CLIP_FK_STUN_OPEN 312
-#define CLIP_FK_STUN_OPENED 313
-#define CLIP_FK_STUN_RECOVER 314
-#define CLIP_FK_STUN_ROLL 315
-#define CLIP_FK_STUN_ROLL_END 316
-#define CLIP_FK_TURN 317
-#define CLIP_FKHEAD_DEATH_LAND 318
-#define CLIP_FKHEAD_HEAD_HIT 319
-#define CLIP_FKHEAD_HEAD_IDLE 320
-#define CLIP_FKHEAD_HEAD_SPAZ 321
-#define CLIP_HATCHER_DEATH_AIR 322
-#define CLIP_HATCHER_DEATH_LAND 323
-#define CLIP_HATCHER_FIRE 324
-#define CLIP_HATCHER_FLY 325
-#define CLIP_HATCHLING_FLY 326
-#define CLIP_SLUG_BOUNCE 327
-#define CLIP_SLUG_DEATH_AIR 328
-#define CLIP_SLUG_DEATH_LAND 329
-#define CLIP_SLUG_IDLE_TODOWN 330
-#define CLIP_SLUG_IDLE_TOUP 331
-#define CLIP_SLUG_IDLE_UP 332
-#define CLIP_SLUG_RUN 333
-#define CLIP_SLUG_STARTLE 334
-#define CLIP_GFLY_BURST 335
-#define CLIP_GFLY_CHARGE 336
-#define CLIP_GFLY_CHARGE_ANTIC 337
-#define CLIP_GFLY_CHARGE_RECOVER 338
-#define CLIP_GFLY_DEATH 339
-#define CLIP_GFLY_FALL 340
-#define CLIP_GFLY_FLY 341
-#define CLIP_GFLY_GURGLE_LOOP 342
-#define CLIP_GFLY_GURGLE_ONCE 343
-#define CLIP_GFLY_SLAM_DOWN 344
-#define CLIP_GFLY_SLAM_END 345
-#define CLIP_GFLY_SLAM_UP 346
-#define CLIP_GFLY_SLEEP 347
-#define CLIP_GFLY_STOP 348
-#define CLIP_GFLY_WAKE 349
-#define CLIP_GFLY_WIGGLE 350
-#define CLIP_MOSSWALKER_APPEAR 351
-#define CLIP_MOSSWALKER_BURY 352
-#define CLIP_MOSSWALKER_DEATH_AIR 353
-#define CLIP_MOSSWALKER_DEATH_LAND 354
-#define CLIP_MOSSWALKER_SHAKE 355
-#define CLIP_MOSSWALKER_TURN 356
-#define CLIP_MOSSWALKER_WALK 357
-#define CLIP_PIGEON_FLY 358
-#define CLIP_PIGEON_IDLE_01 359
-#define CLIP_PIGEON_IDLE_02 360
-#define CLIP_PIGEON_IDLE_03 361
-#define CLIP_PLANTTRAP_DEATH 362
-#define CLIP_PLANTTRAP_IDLE 363
-#define CLIP_PLANTTRAP_RETRACT 364
-#define CLIP_PLANTTRAP_SNAP 365
-#define CLIP_PLANTTRAP_SNAP_READY 366
-#define CLIP_SHAKER_ATTACK 367
-#define CLIP_SHAKER_DEATH_AIR 368
-#define CLIP_SHAKER_DEATH_LAND 369
-#define CLIP_SHAKER_IDLE 370
-#define CLIP_SHAKER_TURN 371
-#define CLIP_SHAKER_WALK 372
-#define CLIP_MOSQUITO_ATTACK 373
-#define CLIP_MOSQUITO_ATTACK_ANTIC 374
-#define CLIP_MOSQUITO_DEATH_AIR 375
-#define CLIP_MOSQUITO_DEATH_LAND 376
-#define CLIP_MOSQUITO_IDLE 377
-#define CLIP_MOSQUITO_STARTLE 378
-#define CLIP_MOSQUITO_TURNTOIDLE 379
-#define CLIP_FATFLY_ATTACK 380
-#define CLIP_FATFLY_DEATH_AIR 381
-#define CLIP_FATFLY_DEATH_LAND 382
-#define CLIP_FATFLY_FLY 383
-#define CLIP_MOSSCHARGER_APPEAR 384
-#define CLIP_MOSSCHARGER_CHARGE 385
-#define CLIP_MOSSCHARGER_DEATH_AIR 386
-#define CLIP_MOSSCHARGER_DEATH_LAND 387
-#define CLIP_MOSSCHARGER_DISAPPEAR 388
-#define CLIP_MOSSCHARGER_ESCAPE 389
-#define CLIP_MOSSCHARGER_GET_UP 390
-#define CLIP_MOSSCHARGER_STUN 391
-#define CLIP_MOSSCHARGER_TURNRUN 392
-#define CLIP_MOSSKNIGHT_DEATH_AIR 393
-#define CLIP_MOSSKNIGHT_DEATH_LAND 394
-#define CLIP_MOSSKNIGHT_DORMANT_1 395
-#define CLIP_MOSSKNIGHT_DORMANT_2 396
-#define CLIP_MOSSKNIGHT_EVADE 397
-#define CLIP_MOSSKNIGHT_IDLE 398
-#define CLIP_MOSSKNIGHT_SHAKE 399
-#define CLIP_MOSSKNIGHT_SHIELD_FRONT 400
-#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 401
-#define CLIP_MOSSKNIGHT_SHIELD_TOP 402
-#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 403
-#define CLIP_MOSSKNIGHT_SHOOT 404
-#define CLIP_MOSSKNIGHT_SHOOT_END 405
-#define CLIP_MOSSKNIGHT_SLASH 406
-#define CLIP_MOSSKNIGHT_SLASH_2 407
-#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 408
-#define CLIP_MOSSKNIGHT_SLASH_EFFECT 409
-#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 410
-#define CLIP_MOSSKNIGHT_SLASH_END 411
-#define CLIP_MOSSKNIGHT_SLASH_QUICK 412
-#define CLIP_MOSSKNIGHT_TURN 413
-#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 414
-#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 415
-#define CLIP_MOSSKNIGHT_WAKE 416
-#define CLIP_MOSSKNIGHT_WALK 417
-#define CLIP_HORNET_A_DASH 418
-#define CLIP_HORNET_A_DASH_ANTIC 419
-#define CLIP_HORNET_AIR_DASH_EFFECT 420
-#define CLIP_HORNET_DEATH_AIR 421
-#define CLIP_HORNET_EVADE 422
-#define CLIP_HORNET_EVADE_ANTIC 423
-#define CLIP_HORNET_FALL 424
-#define CLIP_HORNET_FLASH 425
-#define CLIP_HORNET_FLOURISH 426
-#define CLIP_HORNET_G_DASH 427
-#define CLIP_HORNET_G_DASH_ANTIC 428
-#define CLIP_HORNET_G_DASH_EFFECT 429
-#define CLIP_HORNET_G_DASH_RECOVER1 430
-#define CLIP_HORNET_G_DASH_RECOVER2 431
-#define CLIP_HORNET_HARD_LAND 432
-#define CLIP_HORNET_IDLE 433
-#define CLIP_HORNET_JUMP 434
-#define CLIP_HORNET_JUMP_ANTIC 435
-#define CLIP_HORNET_LAND 436
-#define CLIP_HORNET_NEEDLE 437
-#define CLIP_HORNET_NEEDLE_THREAD 438
-#define CLIP_HORNET_RUN 439
-#define CLIP_HORNET_SPHERE_ANTIC_A 440
-#define CLIP_HORNET_SPHERE_ANTIC_G 441
-#define CLIP_HORNET_SPHERE_ATTACK 442
-#define CLIP_HORNET_SPHERE_BALL 443
-#define CLIP_HORNET_SPHERE_RECOVER_A 444
-#define CLIP_HORNET_SPHERE_RECOVER_G 445
-#define CLIP_HORNET_STUN 446
-#define CLIP_HORNET_STUN_AIR 447
-#define CLIP_HORNET_THROW 448
-#define CLIP_HORNET_THROW_ANTIC 449
-#define CLIP_HORNET_THROW_EFFECT 450
-#define CLIP_HORNET_THROW_RECOVER 451
-#define CLIP_HORNET_WALL_IMPACT 452
-#define CLIP_HORNET_WOUNDED 453
-#define CLIP_BGATE_BG_OPENED 454
-#define CLIP_BGATE_BG_CLOSE_1 455
-#define CLIP_BGATE_BG_CLOSE_2 456
-#define CLIP_BGATE_BG_OPEN 457
-#define CLIP_BGATE_BG_CLOSED 458
-#define CLIP_BGATE_BONE_GATE_OPENED 459
-#define CLIP_BGATE_BONE_GATE_CLOSE 460
-#define CLIP_BGATE_BONE_GATE_CLOSED 461
-#define CLIP_BGATE_BONE_GATE_OPEN 462
-#define CLIP_COCOON_COCOON_IDLE 463
-#define CLIP_COCOON_COCOON_SWEAT 464
-#define CLIP_COCOON_SCUTTLER_LAND 465
-#define CLIP_COCOON_SCUTTLER_RUN 466
-#define CLIP_FX_SPLAT 467
-#define CLIP_FX_SPLAT2 468
-#define CLIP_FIREBALL_BLAST 469
-#define CLIP_FIREBALL_BALL 470
-#define CLIP_FIREBALL_BALL_END 471
-#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 472
-#define CLIP_DRIP_IDLE 473
-#define CLIP_DRIP_DRIP 474
-#define CLIP_DRIP_FALL 475
-#define CLIP_DRIP_IMPACT 476
-#define CLIP_HORNETCS_EVADE 477
-#define CLIP_HORNETCS_EVADE_ANTIC 478
-#define CLIP_HORNETCS_FALL 479
-#define CLIP_HORNETCS_HARPOON_SIDE 480
-#define CLIP_HORNETCS_IDLE 481
-#define CLIP_HORNETCS_JUMP_FULL 482
-#define CLIP_HORNETCS_POINT 483
-#define CLIP_HORNETCS_RUN 484
-#define CLIP_HORNETCS_SOFT_LAND 485
-#define CLIP_HORNETCS_THREAD_1 486
-#define CLIP_HORNETCS_THROW_SIDE 487
-#define CLIP_HORNETCS_THROW_SIDE_START 488
-#define CLIP_HORNETCS_TURN 489
-#define CLIP_HORNETCS_TURNTOIDLE 490
-#define CLIP_BULLET_IDLE 491
-#define CLIP_BULLET_IMPACT 492
-#define CLIP_BULLET_SHOCKWAVE_SPURT 493
-#define CLIP_PROP0_WATERFALL_LOOP 494
-#define CLIP_PROP1_TORCH2 495
-#define CLIP_PROP1_TORCH3 496
-#define CLIP_VM0_FLOWER 497
-#define CLIP_VM0_IDLE 498
-#define CLIP_VM0_REACH 499
-#define CLIP_VM0_REACH_TO_IDLE 500
-#define CLIP_VM0_TALK_LEFT 501
-#define CLIP_VM0_TALK_RIGHT 502
-#define CLIP_VM0_TURN_LEFT 503
-#define CLIP_VM0_TURN_RIGHT 504
-#define CLIP_VM2_IDLE 505
-#define CLIP_VM2_LOOKLEFT 506
-#define CLIP_VM2_LOOKRIGHT 507
-#define CLIP_VM3_IDLE 508
-#define CLIP_VM3_TALK 509
-#define CLIP_VM3_TALK_END 510
-#define CLIP_VM4_IDLE 511
-#define CLIP_VM4_LOOKLEFT 512
-#define CLIP_VM4_LOOKRIGHT 513
-#define CLIP_VM4_SIT 514
-#define CLIP_VM4_SIT_TALK 515
-#define CLIP_VM4_SIT_TALK_END 516
-#define CLIP_VM5_DAZED 517
-#define CLIP_VM5_IDLE 518
-#define CLIP_VM5_TURN_L 519
-#define CLIP_VM5_TURN_R 520
-#define CLIP_VM5_WAKE 521
-#define CLIP_VM8_HEGEMOL_CAST 522
-#define CLIP_VM8_HEGEMOL_IDLE 523
-#define CLIP_VM8_LURIEN_CAST 524
-#define CLIP_VM8_LURIEN_IDLE 525
-#define CLIP_VM8_MONOMON_CAST 526
-#define CLIP_VM8_MONOMON_IDLE 527
-#define CLIP_VM9_IDLE 528
-#define CLIP_VM9_SIT_IDLE 529
-#define CLIP_VM9_SIT_TALK 530
-#define CLIP_VM9_SIT_TALK_END 531
-#define CLIP_VM9_SUMMON 532
-#define CLIP_VM9_TALK 533
-#define CLIP_VM9_TALK_END 534
-#define CLIP_VM9_TURN 535
-#define CLIP_VM11_IDLE 536
-#define CLIP_VM11_LOOK_LEFT 537
-#define CLIP_VM11_LOOK_RIGHT 538
-#define CLIP_VM11_TALK_CONVO_END 539
-#define CLIP_VM11_TALK_CONVO_START 540
-#define CLIP_VM11_TALK_SHOP_END 541
-#define CLIP_VM11_TALK_SHOP_START 542
-#define CLIP_VM12_IDLE 543
-#define CLIP_VM12_SHOP_END 544
-#define CLIP_VM12_SHOP_START 545
-#define CLIP_VM12_TALK_END 546
-#define CLIP_VM12_TALK_START 547
-#define CLIP_VM13_CRY 548
-#define CLIP_VM13_CRY_TURN 549
-#define CLIP_VM13_FREED 550
-#define CLIP_VM13_HOME_BOUNCE 551
-#define CLIP_VM13_HOME_WAVE 552
-#define CLIP_VM13_IDLE 553
-#define CLIP_VM14_BECKON 554
-#define CLIP_VM14_CHEER 555
-#define CLIP_VM14_CRY 556
-#define CLIP_VM14_GIFT 557
-#define CLIP_VM14_IDLE 558
-#define CLIP_ANIM0_DASH_CLOAK_CORPSE000 559
-#define CLIP_ANIM1_GROUND_PLINK_0 560
-#define CLIP_ANIM2_FIREBALL_COLLECT_ANIM 561
-#define SPRITE_HERO_LIGHT 2584
-#define SPRITE_DIALOGUE_BACKBOARD 2585
-#define SPRITE_PROMPT_SHADOW 2586
-#define SPRITE_CORPSE_NAIL 2587
-#define SPRITE_FK_BARREL 2588
-#define SPRITE_FK_STAFF 2589
-#define SPRITE_DIGIT0 2919
+#define 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_GEOBUG_LAMP_BUG_IDLE 156
+#define CLIP_DIALOGUE_ARROW_UP 157
+#define CLIP_DIALOGUE_ARROW_DOWN 158
+#define CLIP_DIALOGUE_STOP_UP 159
+#define CLIP_DIALOGUE_STOP_DOWN 160
+#define CLIP_DIALOGUE_FLEUR_TOP_UP 161
+#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 162
+#define CLIP_DIALOGUE_FLEUR_BOT_UP 163
+#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 164
+#define CLIP_DIALOGUE_DREAM_UP 165
+#define CLIP_DIALOGUE_DREAM_DOWN 166
+#define CLIP_PROMPT_BLANK 167
+#define CLIP_PROMPT_DOWN 168
+#define CLIP_PROMPT_ENTER_DOWN 169
+#define CLIP_PROMPT_ENTER_IDLE 170
+#define CLIP_PROMPT_ENTER_UP 171
+#define CLIP_PROMPT_IDLE 172
+#define CLIP_PROMPT_LISTEN_DOWN 173
+#define CLIP_PROMPT_LISTEN_IDLE 174
+#define CLIP_PROMPT_LISTEN_UP 175
+#define CLIP_PROMPT_UP 176
+#define CLIP_SHADE_APPEAR 177
+#define CLIP_SHADE_CAST 178
+#define CLIP_SHADE_CAST_ANTIC 179
+#define CLIP_SHADE_CAST_CHARGE 180
+#define CLIP_SHADE_CAST_RING 181
+#define CLIP_SHADE_DEATH 182
+#define CLIP_SHADE_DEATH_GLOW 183
+#define CLIP_SHADE_DEATH_START 184
+#define CLIP_SHADE_DEPART 185
+#define CLIP_SHADE_FIREBALL 186
+#define CLIP_SHADE_FIREBALL_END 187
+#define CLIP_SHADE_FLY 188
+#define CLIP_SHADE_IDLE 189
+#define CLIP_SHADE_RETREAT_END 190
+#define CLIP_SHADE_RETREAT_START 191
+#define CLIP_SHADE_SLASH 192
+#define CLIP_SHADE_SLASH_ANTIC 193
+#define CLIP_SHADE_SLASH_CD 194
+#define CLIP_SHADE_SLASH_EFFECT 195
+#define CLIP_SHADE_STARTLE 196
+#define CLIP_SHADE_TURNTOFLY 197
+#define CLIP_SHADE_TURNTOIDLE 198
+#define CLIP_CRAWLER_WALK 199
+#define CLIP_CRAWLER_TURN 200
+#define CLIP_CRAWLER_IDLE 201
+#define CLIP_CRAWLER_DEATH_AIR 202
+#define CLIP_CRAWLER_DEATH_LAND 203
+#define CLIP_BUZZER_CHASE 204
+#define CLIP_BUZZER_IDLE 205
+#define CLIP_BUZZER_STARTLE 206
+#define CLIP_BUZZER_DEATH_AIR 207
+#define CLIP_BUZZER_DEATH_LAND 208
+#define CLIP_BUZZER_FLY 209
+#define CLIP_BUZZER_TURNTOFLY 210
+#define CLIP_BUZZER_TURNTOIDLE 211
+#define CLIP_TIKTIK_DEATH_AIR 212
+#define CLIP_TIKTIK_DEATH_LAND 213
+#define CLIP_TIKTIK_STUN 214
+#define CLIP_TIKTIK_WALK 215
+#define CLIP_GRUZZER_DEATH_AIR 216
+#define CLIP_GRUZZER_DEATH_LAND 217
+#define CLIP_GRUZZER_FLY 218
+#define CLIP_ASPID_DEATH_AIR 219
+#define CLIP_ASPID_FIRE_LONG 220
+#define CLIP_ASPID_FLY 221
+#define CLIP_ASPID_TURNTOFLY 222
+#define CLIP_BALDUR_DEATH_AIR 223
+#define CLIP_BALDUR_DEATH_LAND 224
+#define CLIP_BALDUR_IDLE 225
+#define CLIP_BALDUR_ROLL 226
+#define CLIP_BALDUR_START 227
+#define CLIP_BALDUR_STOP 228
+#define CLIP_ELDERBALDUR_CLOSE1 229
+#define CLIP_ELDERBALDUR_CLOSE2 230
+#define CLIP_ELDERBALDUR_CLOSED 231
+#define CLIP_ELDERBALDUR_DEATH 232
+#define CLIP_ELDERBALDUR_DEATH_STUN 233
+#define CLIP_ELDERBALDUR_HIT 234
+#define CLIP_ELDERBALDUR_IDLE 235
+#define CLIP_ELDERBALDUR_OPEN 236
+#define CLIP_ELDERBALDUR_SHOOT_ANTIC 237
+#define CLIP_ELDERBALDUR_SHOOT_CD 238
+#define CLIP_HUSK_ATTACK_ANTICIPATE 239
+#define CLIP_HUSK_ATTACK_COOLDOWN 240
+#define CLIP_HUSK_ATTACK_LUNGE 241
+#define CLIP_HUSK_DEATH_AIR 242
+#define CLIP_HUSK_DEATH_LAND 243
+#define CLIP_HUSK_IDLE 244
+#define CLIP_HUSK_TURN 245
+#define CLIP_HUSK_WALK 246
+#define CLIP_BARGER_ATTACK_ANTICIPATE 247
+#define CLIP_BARGER_ATTACK_COOLDOWN 248
+#define CLIP_BARGER_ATTACK_LUNGE 249
+#define CLIP_BARGER_DEATH_AIR 250
+#define CLIP_BARGER_DEATH_LAND 251
+#define CLIP_BARGER_IDLE 252
+#define CLIP_BARGER_TURN 253
+#define CLIP_BARGER_WALK 254
+#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 255
+#define CLIP_HORNHEAD_ATTACK_COOLDOWN 256
+#define CLIP_HORNHEAD_ATTACK_LUNGE 257
+#define CLIP_HORNHEAD_DEATH_AIR 258
+#define CLIP_HORNHEAD_DEATH_LAND 259
+#define CLIP_HORNHEAD_IDLE 260
+#define CLIP_HORNHEAD_TURN 261
+#define CLIP_HORNHEAD_WALK 262
+#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 263
+#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 264
+#define CLIP_MOSSRUNNER_ATTACK_LUNGE 265
+#define CLIP_MOSSRUNNER_DEATH_AIR 266
+#define CLIP_MOSSRUNNER_DEATH_LAND 267
+#define CLIP_MOSSRUNNER_IDLE 268
+#define CLIP_MOSSRUNNER_TURN 269
+#define CLIP_MOSSRUNNER_WALK 270
+#define CLIP_LEAPER_ATTACK 271
+#define CLIP_LEAPER_DEATH_AIR 272
+#define CLIP_LEAPER_DEATH_LAND 273
+#define CLIP_LEAPER_IDLE 274
+#define CLIP_LEAPER_LAND 275
+#define CLIP_LEAPER_TURN 276
+#define CLIP_LEAPER_WALK 277
+#define CLIP_GUARD_ANTICIPATE 278
+#define CLIP_GUARD_ATTACK2 279
+#define CLIP_GUARD_DEATH_AIR 280
+#define CLIP_GUARD_DEATH_LAND 281
+#define CLIP_GUARD_DORMANT 282
+#define CLIP_GUARD_IDLE 283
+#define CLIP_GUARD_RUN 284
+#define CLIP_GUARD_STARTLE 285
+#define CLIP_GUARD_STOMP_ANTIC 286
+#define CLIP_GUARD_STOMP_JUMP 287
+#define CLIP_GUARD_STOMP_LAND 288
+#define CLIP_GUARD_STOP_RUN 289
+#define CLIP_GUARD_STOP_WALK 290
+#define CLIP_GUARD_SWIPE 291
+#define CLIP_GUARD_TURN 292
+#define CLIP_GUARD_WAKE 293
+#define CLIP_GUARD_WALK 294
+#define CLIP_FK_ATTACK 295
+#define CLIP_FK_ATTACK_ANTIC 296
+#define CLIP_FK_ATTACK_RECOVER 297
+#define CLIP_FK_BLANK 298
+#define CLIP_FK_BODY 299
+#define CLIP_FK_DEATH_FALL 300
+#define CLIP_FK_DEATH_HEAD_1 301
+#define CLIP_FK_DEATH_HEAD_2 302
+#define CLIP_FK_DEATH_LAND 303
+#define CLIP_FK_DEATH_SPAZ 304
+#define CLIP_FK_IDLE 305
+#define CLIP_FK_JUMP 306
+#define CLIP_FK_JUMP_ANTIC 307
+#define CLIP_FK_JUMP_ATTACK_HIT_1 308
+#define CLIP_FK_JUMP_ATTACK_HIT_2 309
+#define CLIP_FK_JUMP_ATTACK_HIT_3 310
+#define CLIP_FK_JUMP_ATTACK_UP 311
+#define CLIP_FK_LAND 312
+#define CLIP_FK_RAGE 313
+#define CLIP_FK_RUN 314
+#define CLIP_FK_RUN_ANTIC 315
+#define CLIP_FK_STUN_HIT 316
+#define CLIP_FK_STUN_OPEN 317
+#define CLIP_FK_STUN_OPENED 318
+#define CLIP_FK_STUN_RECOVER 319
+#define CLIP_FK_STUN_ROLL 320
+#define CLIP_FK_STUN_ROLL_END 321
+#define CLIP_FK_TURN 322
+#define CLIP_FKHEAD_DEATH_LAND 323
+#define CLIP_FKHEAD_HEAD_HIT 324
+#define CLIP_FKHEAD_HEAD_IDLE 325
+#define CLIP_FKHEAD_HEAD_SPAZ 326
+#define CLIP_HATCHER_DEATH_AIR 327
+#define CLIP_HATCHER_DEATH_LAND 328
+#define CLIP_HATCHER_FIRE 329
+#define CLIP_HATCHER_FLY 330
+#define CLIP_HATCHLING_FLY 331
+#define CLIP_SLUG_BOUNCE 332
+#define CLIP_SLUG_DEATH_AIR 333
+#define CLIP_SLUG_DEATH_LAND 334
+#define CLIP_SLUG_IDLE_TODOWN 335
+#define CLIP_SLUG_IDLE_TOUP 336
+#define CLIP_SLUG_IDLE_UP 337
+#define CLIP_SLUG_RUN 338
+#define CLIP_SLUG_STARTLE 339
+#define CLIP_GFLY_BURST 340
+#define CLIP_GFLY_CHARGE 341
+#define CLIP_GFLY_CHARGE_ANTIC 342
+#define CLIP_GFLY_CHARGE_RECOVER 343
+#define CLIP_GFLY_DEATH 344
+#define CLIP_GFLY_FALL 345
+#define CLIP_GFLY_FLY 346
+#define CLIP_GFLY_GURGLE_LOOP 347
+#define CLIP_GFLY_GURGLE_ONCE 348
+#define CLIP_GFLY_SLAM_DOWN 349
+#define CLIP_GFLY_SLAM_END 350
+#define CLIP_GFLY_SLAM_UP 351
+#define CLIP_GFLY_SLEEP 352
+#define CLIP_GFLY_STOP 353
+#define CLIP_GFLY_WAKE 354
+#define CLIP_GFLY_WIGGLE 355
+#define CLIP_MOSSWALKER_APPEAR 356
+#define CLIP_MOSSWALKER_BURY 357
+#define CLIP_MOSSWALKER_DEATH_AIR 358
+#define CLIP_MOSSWALKER_DEATH_LAND 359
+#define CLIP_MOSSWALKER_SHAKE 360
+#define CLIP_MOSSWALKER_TURN 361
+#define CLIP_MOSSWALKER_WALK 362
+#define CLIP_PIGEON_FLY 363
+#define CLIP_PIGEON_IDLE_01 364
+#define CLIP_PIGEON_IDLE_02 365
+#define CLIP_PIGEON_IDLE_03 366
+#define CLIP_PLANTTRAP_DEATH 367
+#define CLIP_PLANTTRAP_IDLE 368
+#define CLIP_PLANTTRAP_RETRACT 369
+#define CLIP_PLANTTRAP_SNAP 370
+#define CLIP_PLANTTRAP_SNAP_READY 371
+#define CLIP_SHAKER_ATTACK 372
+#define CLIP_SHAKER_DEATH_AIR 373
+#define CLIP_SHAKER_DEATH_LAND 374
+#define CLIP_SHAKER_IDLE 375
+#define CLIP_SHAKER_TURN 376
+#define CLIP_SHAKER_WALK 377
+#define CLIP_MOSQUITO_ATTACK 378
+#define CLIP_MOSQUITO_ATTACK_ANTIC 379
+#define CLIP_MOSQUITO_DEATH_AIR 380
+#define CLIP_MOSQUITO_DEATH_LAND 381
+#define CLIP_MOSQUITO_IDLE 382
+#define CLIP_MOSQUITO_STARTLE 383
+#define CLIP_MOSQUITO_TURNTOIDLE 384
+#define CLIP_FATFLY_ATTACK 385
+#define CLIP_FATFLY_DEATH_AIR 386
+#define CLIP_FATFLY_DEATH_LAND 387
+#define CLIP_FATFLY_FLY 388
+#define CLIP_MOSSCHARGER_APPEAR 389
+#define CLIP_MOSSCHARGER_CHARGE 390
+#define CLIP_MOSSCHARGER_DEATH_AIR 391
+#define CLIP_MOSSCHARGER_DEATH_LAND 392
+#define CLIP_MOSSCHARGER_DISAPPEAR 393
+#define CLIP_MOSSCHARGER_ESCAPE 394
+#define CLIP_MOSSCHARGER_GET_UP 395
+#define CLIP_MOSSCHARGER_STUN 396
+#define CLIP_MOSSCHARGER_TURNRUN 397
+#define CLIP_MOSSKNIGHT_DEATH_AIR 398
+#define CLIP_MOSSKNIGHT_DEATH_LAND 399
+#define CLIP_MOSSKNIGHT_DORMANT_1 400
+#define CLIP_MOSSKNIGHT_DORMANT_2 401
+#define CLIP_MOSSKNIGHT_EVADE 402
+#define CLIP_MOSSKNIGHT_IDLE 403
+#define CLIP_MOSSKNIGHT_SHAKE 404
+#define CLIP_MOSSKNIGHT_SHIELD_FRONT 405
+#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 406
+#define CLIP_MOSSKNIGHT_SHIELD_TOP 407
+#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 408
+#define CLIP_MOSSKNIGHT_SHOOT 409
+#define CLIP_MOSSKNIGHT_SHOOT_END 410
+#define CLIP_MOSSKNIGHT_SLASH 411
+#define CLIP_MOSSKNIGHT_SLASH_2 412
+#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 413
+#define CLIP_MOSSKNIGHT_SLASH_EFFECT 414
+#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 415
+#define CLIP_MOSSKNIGHT_SLASH_END 416
+#define CLIP_MOSSKNIGHT_SLASH_QUICK 417
+#define CLIP_MOSSKNIGHT_TURN 418
+#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 419
+#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 420
+#define CLIP_MOSSKNIGHT_WAKE 421
+#define CLIP_MOSSKNIGHT_WALK 422
+#define CLIP_HORNET_A_DASH 423
+#define CLIP_HORNET_A_DASH_ANTIC 424
+#define CLIP_HORNET_AIR_DASH_EFFECT 425
+#define CLIP_HORNET_DEATH_AIR 426
+#define CLIP_HORNET_EVADE 427
+#define CLIP_HORNET_EVADE_ANTIC 428
+#define CLIP_HORNET_FALL 429
+#define CLIP_HORNET_FLASH 430
+#define CLIP_HORNET_FLOURISH 431
+#define CLIP_HORNET_G_DASH 432
+#define CLIP_HORNET_G_DASH_ANTIC 433
+#define CLIP_HORNET_G_DASH_EFFECT 434
+#define CLIP_HORNET_G_DASH_RECOVER1 435
+#define CLIP_HORNET_G_DASH_RECOVER2 436
+#define CLIP_HORNET_HARD_LAND 437
+#define CLIP_HORNET_IDLE 438
+#define CLIP_HORNET_JUMP 439
+#define CLIP_HORNET_JUMP_ANTIC 440
+#define CLIP_HORNET_LAND 441
+#define CLIP_HORNET_NEEDLE 442
+#define CLIP_HORNET_NEEDLE_THREAD 443
+#define CLIP_HORNET_RUN 444
+#define CLIP_HORNET_SPHERE_ANTIC_A 445
+#define CLIP_HORNET_SPHERE_ANTIC_G 446
+#define CLIP_HORNET_SPHERE_ATTACK 447
+#define CLIP_HORNET_SPHERE_BALL 448
+#define CLIP_HORNET_SPHERE_RECOVER_A 449
+#define CLIP_HORNET_SPHERE_RECOVER_G 450
+#define CLIP_HORNET_STUN 451
+#define CLIP_HORNET_STUN_AIR 452
+#define CLIP_HORNET_THROW 453
+#define CLIP_HORNET_THROW_ANTIC 454
+#define CLIP_HORNET_THROW_EFFECT 455
+#define CLIP_HORNET_THROW_RECOVER 456
+#define CLIP_HORNET_WALL_IMPACT 457
+#define CLIP_HORNET_WOUNDED 458
+#define CLIP_BGATE_BG_CLOSE_1 459
+#define CLIP_BGATE_BG_CLOSE_2 460
+#define CLIP_BGATE_BG_CLOSED 461
+#define CLIP_BGATE_BG_OPEN 462
+#define CLIP_BGATE_BG_OPENED 463
+#define CLIP_BGATE_BONE_GATE_CLOSE 464
+#define CLIP_BGATE_BONE_GATE_CLOSED 465
+#define CLIP_BGATE_BONE_GATE_OPEN 466
+#define CLIP_BGATE_BONE_GATE_OPENED 467
+#define CLIP_BGATE_SWITCH_ACTIVATED 468
+#define CLIP_BGATE_SWITCH_HIT 469
+#define CLIP_BGATE_SWITCH_IDLE 470
+#define CLIP_COCOON_COCOON_IDLE 471
+#define CLIP_COCOON_COCOON_SWEAT 472
+#define CLIP_COCOON_SCUTTLER_LAND 473
+#define CLIP_COCOON_SCUTTLER_RUN 474
+#define CLIP_FX_SPLAT 475
+#define CLIP_FX_SPLAT2 476
+#define CLIP_FIREBALL_BLAST 477
+#define CLIP_FIREBALL_BALL 478
+#define CLIP_FIREBALL_BALL_END 479
+#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 480
+#define CLIP_DRIP_IDLE 481
+#define CLIP_DRIP_DRIP 482
+#define CLIP_DRIP_FALL 483
+#define CLIP_DRIP_IMPACT 484
+#define CLIP_HORNETCS_EVADE 485
+#define CLIP_HORNETCS_EVADE_ANTIC 486
+#define CLIP_HORNETCS_FALL 487
+#define CLIP_HORNETCS_HARPOON_SIDE 488
+#define CLIP_HORNETCS_IDLE 489
+#define CLIP_HORNETCS_JUMP_FULL 490
+#define CLIP_HORNETCS_POINT 491
+#define CLIP_HORNETCS_RUN 492
+#define CLIP_HORNETCS_SOFT_LAND 493
+#define CLIP_HORNETCS_THREAD_1 494
+#define CLIP_HORNETCS_THROW_SIDE 495
+#define CLIP_HORNETCS_THROW_SIDE_START 496
+#define CLIP_HORNETCS_TURN 497
+#define CLIP_HORNETCS_TURNTOIDLE 498
+#define CLIP_BULLET_IDLE 499
+#define CLIP_BULLET_IMPACT 500
+#define CLIP_BULLET_SHOCKWAVE_SPURT 501
+#define CLIP_PROP0_WATERFALL_LOOP 502
+#define CLIP_PROP1_TORCH2 503
+#define CLIP_PROP1_TORCH3 504
+#define CLIP_VM0_FLOWER 505
+#define CLIP_VM0_IDLE 506
+#define CLIP_VM0_REACH 507
+#define CLIP_VM0_REACH_TO_IDLE 508
+#define CLIP_VM0_TALK_LEFT 509
+#define CLIP_VM0_TALK_RIGHT 510
+#define CLIP_VM0_TURN_LEFT 511
+#define CLIP_VM0_TURN_RIGHT 512
+#define CLIP_VM2_IDLE 513
+#define CLIP_VM2_LOOKLEFT 514
+#define CLIP_VM2_LOOKRIGHT 515
+#define CLIP_VM3_IDLE 516
+#define CLIP_VM3_TALK 517
+#define CLIP_VM3_TALK_END 518
+#define CLIP_VM4_IDLE 519
+#define CLIP_VM4_LOOKLEFT 520
+#define CLIP_VM4_LOOKRIGHT 521
+#define CLIP_VM4_SIT 522
+#define CLIP_VM4_SIT_TALK 523
+#define CLIP_VM4_SIT_TALK_END 524
+#define CLIP_VM5_ARRIVE 525
+#define CLIP_VM5_ARRIVE_SMOKE 526
+#define CLIP_VM5_IDLE 527
+#define CLIP_VM6_BELL_IDLE 528
+#define CLIP_VM6_BELL_RING_R 529
+#define CLIP_VM6_BELL_STAND 530
+#define CLIP_VM6_BELL_STAND_APPEAR 531
+#define CLIP_VM6_BOX_DISAPPEAR 532
+#define CLIP_VM6_BOX_IDLE 533
+#define CLIP_VM6_FRONT 534
+#define CLIP_VM6_GRATE_DISAPPEAR 535
+#define CLIP_VM6_GRATE_IDLE 536
+#define CLIP_VM8_DAZED 537
+#define CLIP_VM8_IDLE 538
+#define CLIP_VM8_TURN_L 539
+#define CLIP_VM8_TURN_R 540
+#define CLIP_VM8_WAKE 541
+#define CLIP_VM11_HEGEMOL_CAST 542
+#define CLIP_VM11_HEGEMOL_IDLE 543
+#define CLIP_VM11_LURIEN_CAST 544
+#define CLIP_VM11_LURIEN_IDLE 545
+#define CLIP_VM11_MONOMON_CAST 546
+#define CLIP_VM11_MONOMON_IDLE 547
+#define CLIP_VM12_IDLE 548
+#define CLIP_VM12_SIT_IDLE 549
+#define CLIP_VM12_SIT_TALK 550
+#define CLIP_VM12_SIT_TALK_END 551
+#define CLIP_VM12_SUMMON 552
+#define CLIP_VM12_TALK 553
+#define CLIP_VM12_TALK_END 554
+#define CLIP_VM12_TURN 555
+#define CLIP_VM14_IDLE 556
+#define CLIP_VM14_LOOK_LEFT 557
+#define CLIP_VM14_LOOK_RIGHT 558
+#define CLIP_VM14_TALK_CONVO_END 559
+#define CLIP_VM14_TALK_CONVO_START 560
+#define CLIP_VM14_TALK_SHOP_END 561
+#define CLIP_VM14_TALK_SHOP_START 562
+#define CLIP_VM15_IDLE 563
+#define CLIP_VM15_SHOP_END 564
+#define CLIP_VM15_SHOP_START 565
+#define CLIP_VM15_TALK_END 566
+#define CLIP_VM15_TALK_START 567
+#define CLIP_VM16_CRY 568
+#define CLIP_VM16_CRY_TURN 569
+#define CLIP_VM16_FREED 570
+#define CLIP_VM16_HOME_BOUNCE 571
+#define CLIP_VM16_HOME_WAVE 572
+#define CLIP_VM16_IDLE 573
+#define CLIP_VM17_BECKON 574
+#define CLIP_VM17_CHEER 575
+#define CLIP_VM17_CRY 576
+#define CLIP_VM17_GIFT 577
+#define CLIP_VM17_IDLE 578
+#define CLIP_ANIM0_STAG_DOOR_OPEN00 579
+#define CLIP_ANIM1_DASH_CLOAK_CORPSE000 580
+#define CLIP_ANIM2_GROUND_PLINK_0 581
+#define CLIP_ANIM3_FIREBALL_COLLECT_ANIM 582
+#define SPRITE_HERO_LIGHT 2830
+#define SPRITE_DIALOGUE_BACKBOARD 2831
+#define SPRITE_PROMPT_SHADOW 2832
+#define SPRITE_CORPSE_NAIL 2833
+#define SPRITE_FK_BARREL 2834
+#define SPRITE_FK_STAFF 2835
+#define SPRITE_DIGIT0 3185
#define STYLE_DIALOGUE 0
#define STYLE_PROMPT 1
#define STYLE_TITLE_L 2
@@ -639,7 +660,8 @@
#define STYLE_MENU 10
#define STYLE_MENU_TITLE 11
#define STYLE_MENU_SMALL 12
-#define STYLE_MSG_S 13
+#define STYLE_YN 13
+#define STYLE_MSG_S 14
#define TEXT_K 1.333333f
#define FONT_PHASES 4
#define EK_CRAWLER 1
@@ -672,21 +694,21 @@
#define EK_MOSSKNIGHT 28
#define EK_HORNET 29
#define NUM_KINDS 30
-#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 195, 194, -1, -1, -1, -1, -1, -1, -1, -1, 197, 198}}, {EF_BUZZER, {200, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 202, 203}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 210, 209, -1, -1, -1, -1, -1, -1, -1, 207, 208}}, {EF_BOUNCER, {-1, -1, -1, 213, -1, -1, -1, -1, -1, -1, -1, 211, 212}}, {EF_SPITTER, {-1, -1, -1, 216, 217, 215, -1, -1, -1, -1, -1, 214, -1}}, {EF_ROLLER, {220, -1, -1, 222, 221, 223, -1, -1, -1, -1, -1, 218, 219}}, {EF_BLOCKER, {230, -1, -1, 226, 231, 224, 225, 232, 233, 229, 228, -1, 227}}, {EF_HUSK, {239, 240, 241, 234, 236, 235, -1, -1, -1, -1, -1, 237, 238}}, {EF_HUSK, {247, 248, 249, 242, 244, 243, -1, -1, -1, -1, -1, 245, 246}}, {EF_HUSK, {255, 256, 257, 250, 252, 251, -1, -1, -1, -1, -1, 253, 254}}, {EF_HUSK, {263, 264, 265, 258, 260, 259, -1, -1, -1, -1, -1, 261, 262}}, {EF_LEAPER, {269, 271, 272, 266, 270, -1, -1, -1, -1, -1, -1, 267, 268}}, {EF_GUARD, {278, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 275, 276}}, {EF_FK, {300, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 298}}, {EF_FKHEAD, {320, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 318}}, {EF_HATCHER, {-1, -1, -1, 325, 324, -1, -1, -1, -1, -1, -1, 322, 323}}, {EF_HATCHLING, {-1, -1, -1, 326, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {332, -1, -1, 330, 331, 334, 333, 327, -1, -1, -1, 328, 329}}, {EF_GFLY, {347, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 356, 357, 355, 351, 352, -1, -1, -1, -1, -1, 353, 354}}, {EF_PIGEON, {-1, -1, -1, 359, 360, 361, 358, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {363, -1, -1, 366, 365, 364, -1, -1, -1, -1, -1, 362, -1}}, {EF_SHAKER, {370, 371, 372, 367, -1, -1, -1, -1, -1, -1, -1, 368, 369}}, {EF_MOSQUITO, {377, -1, -1, 379, 378, 374, 373, -1, -1, -1, -1, 375, 376}}, {EF_FATFLY, {383, -1, -1, 380, -1, -1, -1, -1, -1, -1, -1, 381, 382}}, {EF_MOSSCHARGER, {-1, -1, -1, 384, 385, 388, 391, 390, 392, 389, -1, 386, 387}}, {EF_MOSSKNIGHT, {398, 413, 417, -1, -1, -1, -1, -1, -1, -1, -1, 393, 394}}, {EF_HORNET, {433, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 421, -1}}}
-#define TXT_PROMPT_LISTEN 68
-#define TXT_PROMPT_REST 69
-#define TXT_PROMPT_INSPECT 70
-#define TXT_PROMPT_ENTER 71
-#define TXT_PROMPT_SIT 72
-#define TXT_PROMPT_SHOP 73
-#define TXT_PROMPT_TRAVEL 74
-#define TXT_PROMPT_ASCEND 75
-#define TXT_PROMPT_DESCEND 76
-#define TXT_PROMPT_EXIT 77
-#define TXT_PROMPT_ACCEPT 78
-#define TXT_PROMPT_TRADE 79
-#define TXT_PROMPT_WATCH 80
-#define TXT_PROMPT_CHALLENGE 81
+#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 200, 199, -1, -1, -1, -1, -1, -1, -1, -1, 202, 203}}, {EF_BUZZER, {205, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 207, 208}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 215, 214, -1, -1, -1, -1, -1, -1, -1, 212, 213}}, {EF_BOUNCER, {-1, -1, -1, 218, -1, -1, -1, -1, -1, -1, -1, 216, 217}}, {EF_SPITTER, {-1, -1, -1, 221, 222, 220, -1, -1, -1, -1, -1, 219, -1}}, {EF_ROLLER, {225, -1, -1, 227, 226, 228, -1, -1, -1, -1, -1, 223, 224}}, {EF_BLOCKER, {235, -1, -1, 231, 236, 229, 230, 237, 238, 234, 233, -1, 232}}, {EF_HUSK, {244, 245, 246, 239, 241, 240, -1, -1, -1, -1, -1, 242, 243}}, {EF_HUSK, {252, 253, 254, 247, 249, 248, -1, -1, -1, -1, -1, 250, 251}}, {EF_HUSK, {260, 261, 262, 255, 257, 256, -1, -1, -1, -1, -1, 258, 259}}, {EF_HUSK, {268, 269, 270, 263, 265, 264, -1, -1, -1, -1, -1, 266, 267}}, {EF_LEAPER, {274, 276, 277, 271, 275, -1, -1, -1, -1, -1, -1, 272, 273}}, {EF_GUARD, {283, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 280, 281}}, {EF_FK, {305, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 303}}, {EF_FKHEAD, {325, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 323}}, {EF_HATCHER, {-1, -1, -1, 330, 329, -1, -1, -1, -1, -1, -1, 327, 328}}, {EF_HATCHLING, {-1, -1, -1, 331, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {337, -1, -1, 335, 336, 339, 338, 332, -1, -1, -1, 333, 334}}, {EF_GFLY, {352, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 361, 362, 360, 356, 357, -1, -1, -1, -1, -1, 358, 359}}, {EF_PIGEON, {-1, -1, -1, 364, 365, 366, 363, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {368, -1, -1, 371, 370, 369, -1, -1, -1, -1, -1, 367, -1}}, {EF_SHAKER, {375, 376, 377, 372, -1, -1, -1, -1, -1, -1, -1, 373, 374}}, {EF_MOSQUITO, {382, -1, -1, 384, 383, 379, 378, -1, -1, -1, -1, 380, 381}}, {EF_FATFLY, {388, -1, -1, 385, -1, -1, -1, -1, -1, -1, -1, 386, 387}}, {EF_MOSSCHARGER, {-1, -1, -1, 389, 390, 393, 396, 395, 397, 394, -1, 391, 392}}, {EF_MOSSKNIGHT, {403, 418, 422, -1, -1, -1, -1, -1, -1, -1, -1, 398, 399}}, {EF_HORNET, {438, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 426, -1}}}
+#define TXT_PROMPT_LISTEN 87
+#define TXT_PROMPT_REST 88
+#define TXT_PROMPT_INSPECT 89
+#define TXT_PROMPT_ENTER 90
+#define TXT_PROMPT_SIT 91
+#define TXT_PROMPT_SHOP 92
+#define TXT_PROMPT_TRAVEL 93
+#define TXT_PROMPT_ASCEND 94
+#define TXT_PROMPT_DESCEND 95
+#define TXT_PROMPT_EXIT 96
+#define TXT_PROMPT_ACCEPT 97
+#define TXT_PROMPT_TRADE 98
+#define TXT_PROMPT_WATCH 99
+#define TXT_PROMPT_CHALLENGE 100
#define PROMPT_SORT 884737u
#define DIGIT_ADV {0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f}
#define VMOP_NOP 1
@@ -794,6 +816,20 @@
#define VMOP_LISTENFORINVENTORY 103
#define VMOP_WAITRANDOM 104
#define VMOP_FLINGPIECE 105
+#define VMOP_STARTCONVERSATIONYN 106
+#define VMOP_SETTOLL 107
+#define VMOP_SETYNREQUESTER 108
+#define VMOP_SENDEVENTOF 109
+#define VMOP_HUDSLIDE 110
+#define VMOP_OPENSTAGMENU 111
+#define VMOP_SETNEXTSCENE 112
+#define VMOP_STAGTRAVEL 113
+#define VMOP_TRANSLATE 114
+#define VMOP_HEROCOLLISION 115
+#define VMOP_PLATFORMSTICK 116
+#define VMOP_WAITFORHEROINPOSITION 117
+#define VMOP_SENDTRIGGER2DEVENT 118
+#define VMOP_FREEZEMOMENT 119
#define VMEV_FINISHED 0
#define VMEV_CONVO_FINISH 1
#define VMEV_CONVO_START 2
@@ -828,17 +864,23 @@
#define VMEV_SHOP_WINDOW_UP 31
#define VMEV_RESET_SHOP_WINDOW 32
#define VMEV_CLOSE_SHOP_WINDOW 33
+#define VMEV_BOX_UP_YN 34
+#define VMEV_BOX_DOWN_YN 35
+#define VMEV_YES 36
+#define VMEV_NO 37
+#define VMEV_CONTINUE 38
#define VMSTR_NPC_TITLE 14
-#define VMSTR_VISITED 349
-#define VMSTR_DISPLAY_RIGHT 350
-#define VMSTR_HORNET_SAVER 104
-#define VMSTR_ITEM 303
-#define STR_ATTACK_RANGE 23
-#define STR_EVADE_RANGE 50
-#define STR_SPIT_RANGE 51
-#define STR_WAKE_BOX 52
-#define STR_SLASH_HITBOX 53
-#define STR_SLASH2_HITBOX 54
+#define VMSTR_VISITED 443
+#define VMSTR_DISPLAY_RIGHT 444
+#define VMSTR_HORNET_SAVER 193
+#define VMSTR_ITEM 387
+#define STR_ATTACK_RANGE 22
+#define STR_EVADE_RANGE 49
+#define STR_SPIT_RANGE 50
+#define STR_WAKE_BOX 51
+#define STR_SLASH_HITBOX 52
+#define STR_SLASH2_HITBOX 53
+#define STR_DOOR_STAGEXIT 20
#define TITLE_KINGSPASS 0
#define TITLE_DIRTMOUTH 1
#define TITLE_CROSSROADS 2
@@ -860,64 +902,67 @@
#define TITLE_TISO_NC 18
#define TITLE_CHARM_SLUG 19
#define NUM_TITLES 20
-#define TITLE_TABLE {{82, 83, -1, -1}, {84, 85, 86, -1}, {87, 88, -1, 89}, {90, 91, -1, 92}, {93, 94, -1, 95}, {96, 97, -1, -1}, {98, 99, 100, -1}, {101, 102, -1, -1}, {103, 104, -1, -1}, {105, 106, -1, -1}, {107, 108, -1, -1}, {109, 110, -1, -1}, {111, 112, -1, -1}, {113, 114, -1, -1}, {115, 116, -1, 117}, {118, 119, -1, 120}, {118, 119, -1, 121}, {122, 123, 124, -1}, {122, 123, -1, -1}, {125, 126, -1, 127}}
-#define SPRITE_FLEUR_TOP 2590
+#define TITLE_TABLE {{101, 102, -1, -1}, {103, 104, 105, -1}, {106, 107, -1, 108}, {109, 110, -1, 111}, {112, 113, -1, 114}, {115, 116, -1, -1}, {117, 118, 119, -1}, {120, 121, -1, -1}, {122, 123, -1, -1}, {124, 125, -1, -1}, {126, 127, -1, -1}, {128, 129, -1, -1}, {130, 131, -1, -1}, {132, 133, -1, -1}, {134, 135, -1, 136}, {137, 138, -1, 139}, {137, 138, -1, 140}, {141, 142, 143, -1}, {141, 142, -1, -1}, {144, 145, -1, 146}}
+#define SPRITE_FLEUR_TOP 2836
#define FLEUR_TOP_RECTS {{0.781f, -0.844f, 0.953f, -0.688f}, {-1.078f, -0.984f, 1.141f, -0.531f}, {-1.281f, -1.016f, 1.313f, -0.484f}, {-1.359f, -1.016f, 1.969f, -0.141f}, {-2.141f, -1.031f, 2.531f, 0.047f}, {-2.250f, -1.078f, 2.766f, 0.266f}, {-2.797f, -1.203f, 3.094f, 0.578f}, {-2.938f, -1.219f, 3.219f, 0.859f}, {-3.203f, -1.234f, 3.469f, 1.141f}, {-3.312f, -1.234f, 3.766f, 1.281f}, {-3.547f, -1.250f, 4.000f, 1.328f}, {-3.844f, -1.250f, 4.016f, 1.328f}, {-4.016f, -1.250f, 4.031f, 1.344f}, {-4.031f, -1.250f, 4.031f, 1.344f}, {-4.047f, -1.250f, 4.031f, 1.359f}, {-4.047f, -1.250f, 4.031f, 1.359f}, {-4.047f, -1.266f, 4.031f, 1.359f}, {-4.047f, -1.266f, 4.031f, 1.359f}, {-4.062f, -1.266f, 4.047f, 1.375f}, {-4.062f, -1.266f, 4.047f, 1.375f}, {-4.062f, -1.266f, 4.047f, 1.375f}, {-4.062f, -1.266f, 4.047f, 1.375f}}
#define FLEUR_FRAMES 22
#define FLEUR_FPS 15.0f
-#define SPRITE_FLEUR_BOT 2591
+#define SPRITE_FLEUR_BOT 2837
#define FLEUR_BOT_RECTS {{0.000f, 0.000f, 0.016f, 0.016f}, {0.000f, 0.000f, 0.016f, 0.016f}, {0.391f, 0.406f, 0.828f, 0.844f}, {-1.063f, 0.281f, 1.516f, 1.016f}, {-1.594f, -0.047f, 2.109f, 1.031f}, {-1.984f, -0.156f, 2.375f, 1.047f}, {-2.531f, -0.438f, 2.719f, 1.172f}, {-2.688f, -0.594f, 2.766f, 1.188f}, {-2.797f, -0.797f, 3.156f, 1.219f}, {-3.078f, -0.938f, 3.219f, 1.219f}, {-3.250f, -1.156f, 3.438f, 1.219f}, {-3.250f, -1.172f, 3.828f, 1.219f}, {-3.781f, -1.188f, 4.203f, 1.234f}, {-3.984f, -1.188f, 4.344f, 1.234f}, {-4.281f, -1.203f, 4.562f, 1.234f}, {-4.406f, -1.203f, 4.641f, 1.234f}, {-4.578f, -1.219f, 4.719f, 1.234f}, {-4.656f, -1.219f, 4.719f, 1.234f}, {-4.734f, -1.219f, 4.734f, 1.234f}, {-4.750f, -1.234f, 4.734f, 1.234f}, {-4.766f, -1.234f, 4.734f, 1.250f}, {-4.766f, -1.234f, 4.734f, 1.250f}}
-#define SPRITE_MSG_BG 2592
-#define SPRITE_MSG_STOP 2593
-#define SPRITE_MSG_FLEUR 2594
-#define SPRITE_MSG_KEY 2595
-#define SPRITE_MSG_ICON_FIREBALL 2596
-#define SPRITE_MSG_ICON_DASH 2597
-#define SPRITE_GRASS_BALL 2598
-#define MSG_TABLE {{128, 129, 130, 131, 132, 133}, {134, 135, 136, 137, 138, 139}}
-#define NOTICE_BACKBOARD {2599, 1.0000f, 0.6931f}
-#define TUTE_FLEUR {2594, 1.0000f, 1.0000f}
-#define TUTE_BACKBOARD {2600, 1.0000f, 0.9560f}
-#define TUTE_IMAGE {2601, 1.0000f, 1.0000f}
-#define TUTE_STOP {2593, 1.0000f, 1.0000f}
-#define NOTICE_ICONS {2602, 2603, 2604}
+#define SPRITE_MSG_BG 2838
+#define SPRITE_MSG_STOP 2839
+#define SPRITE_MSG_FLEUR 2840
+#define SPRITE_MSG_KEY 2841
+#define SPRITE_MSG_ICON_FIREBALL 2842
+#define SPRITE_MSG_ICON_DASH 2843
+#define SPRITE_GRASS_BALL 2844
+#define MSG_TABLE {{147, 148, 149, 150, 151, 152}, {153, 154, 155, 156, 157, 158}}
+#define NOTICE_BACKBOARD {2845, 1.0000f, 0.6931f}
+#define TUTE_FLEUR {2840, 1.0000f, 1.0000f}
+#define TUTE_BACKBOARD {2846, 1.0000f, 0.9560f}
+#define TUTE_IMAGE {2847, 1.0000f, 1.0000f}
+#define TUTE_STOP {2839, 1.0000f, 1.0000f}
+#define NOTICE_ICONS {2848, 2849, 2850}
#define CHARM_ICON_K 1.5000f
-#define CHARM_ICONS {-1, 2605, 2606, 2607, 2608, -1, 2609, 2610, 2611, -1, -1, -1, -1, -1, 2612, -1, -1, -1, 2613, 2614, 2615, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define CHARM_NAMES {-1, 140, 141, 142, 143, -1, 144, 145, 146, -1, -1, -1, -1, -1, 147, -1, -1, -1, 148, 149, 150, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define TXT_CHARM_TUTE_TITLE 151
-#define TXT_CHARM_TUTE_SUB 152
-#define TXT_CHARM_REMINDER 153
-#define MENU_LOGO {2616, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CHARM_ICONS {-1, 2851, 2852, 2853, 2854, -1, 2855, 2856, 2857, -1, -1, -1, -1, -1, 2858, -1, -1, -1, 2859, 2860, 2861, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CHARM_NAMES {-1, 159, 160, 161, 162, -1, 163, 164, 165, -1, -1, -1, -1, -1, 166, -1, -1, -1, 167, 168, 169, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define TXT_CHARM_TUTE_TITLE 170
+#define TXT_CHARM_TUTE_SUB 171
+#define TXT_CHARM_REMINDER 172
+#define TXT_YN_YES 173
+#define TXT_YN_NO 174
+#define TXT_YN_NOT_ENOUGH 175
+#define MENU_LOGO {2862, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_LOGO_Y 3.6585f
#define MENU_START_Y -1.4181f
#define MENU_QUIT_Y -2.3582f
-#define MENU_POINTER {2617, 0.0000f, 0.0000f, 1.0023f, 1.0000f}
+#define MENU_POINTER {2863, 0.0000f, 0.0000f, 1.0023f, 1.0000f}
#define MENU_POINTER_GAP 0.7525f
#define MENU_PROFILES_TITLE_Y 6.4481f
-#define MENU_PROFILES_FLEUR {2618, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
+#define MENU_PROFILES_FLEUR {2864, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
#define MENU_PROFILES_FLEUR_Y 5.4077f
#define MENU_SLOT_X -2.8186f
#define MENU_SLOT_Y 3.1252f
#define MENU_SLOT_DY -2.3269f
-#define MENU_SLOT_ZONES {{2, {2619, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2620, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2621, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2622, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2623, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
+#define MENU_SLOT_ZONES {{2, {2865, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2866, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2867, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2868, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2869, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
#define MENU_SLOT_NZONES 5
#define MENU_SLOT_BG_DY 0.0102f
-#define MENU_SLOT_FLEUR {2624, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_FLEUR {2870, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_SLOT_FLEUR_X 0.0000f
#define MENU_SLOT_FLEUR_Y 0.4512f
-#define MENU_SLOT_SELECTOR {2625, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_SELECTOR {2871, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_SLOT_SELECTOR_X -0.1626f
#define MENU_SLOT_SELECTOR_Y 0.0813f
-#define MENU_SLOT_CURSOR {2626, 0.0000f, 0.0000f, 1.0000f, 1.0025f}
+#define MENU_SLOT_CURSOR {2872, 0.0000f, 0.0000f, 1.0000f, 1.0025f}
#define MENU_SLOT_CURSOR_X -8.2367f
#define MENU_SLOT_CURSOR_Y 0.0000f
-#define MENU_SLOT_ORB {2627, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_ORB {2873, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_SLOT_ORB_X -4.3089f
#define MENU_SLOT_ORB_Y 0.1230f
-#define MENU_SLOT_GEO {2628, 0.0000f, 0.0000f, 1.0039f, 1.0000f}
+#define MENU_SLOT_GEO {2874, 0.0000f, 0.0000f, 1.0039f, 1.0000f}
#define MENU_SLOT_GEO_X -3.6961f
#define MENU_SLOT_GEO_Y -0.5395f
-#define MENU_SLOT_HEALTH {2629, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_HEALTH {2875, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_SLOT_HEALTH_X -3.5916f
#define MENU_SLOT_HEALTH_Y 0.3577f
#define MENU_SLOT_CURSOR_X2 8.0334f
@@ -935,60 +980,60 @@
#define MENU_SLOT_YES_X 2.5813f
#define MENU_SLOT_NO_X 6.2296f
#define MENU_BACK_Y -5.5406f
-#define MENU_PAUSE_TOP {2630, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_TOP {2876, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_PAUSE_TOP_Y 2.3653f
-#define MENU_PAUSE_BOT {2631, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_BOT {2877, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_PAUSE_BOT_Y -1.8877f
#define MENU_PAUSE_CONTINUE_Y 0.6428f
#define MENU_PAUSE_QUIT_Y -0.4548f
-#define TXT_MAIN_START 154
-#define TXT_MAIN_QUIT 155
-#define TXT_PROFILE_NEW_GAME 156
-#define TXT_PROFILE_CLEAR_BUTTON 157
-#define TXT_PROFILE_CLEAR_PROMPT 158
-#define TXT_NAV_YES 159
-#define TXT_NAV_NO 160
-#define TXT_NAV_BACK 161
-#define TXT_PAUSE_CONTINUE 162
-#define TXT_PAUSE_MAIN 163
-#define TXT_PROFILE_CORRUPTED 164
-#define TXT_SCREEN_SAVE_PROFILES 165
-#define TXT_ZONES {166, 167, 168, 169, 170}
+#define TXT_MAIN_START 176
+#define TXT_MAIN_QUIT 177
+#define TXT_PROFILE_NEW_GAME 178
+#define TXT_PROFILE_CLEAR_BUTTON 179
+#define TXT_PROFILE_CLEAR_PROMPT 180
+#define TXT_NAV_YES 181
+#define TXT_NAV_NO 182
+#define TXT_NAV_BACK 183
+#define TXT_PAUSE_CONTINUE 184
+#define TXT_PAUSE_MAIN 185
+#define TXT_PROFILE_CORRUPTED 186
+#define TXT_SCREEN_SAVE_PROFILES 187
+#define TXT_ZONES {188, 189, 190, 191, 192}
#define INV_X -4.0500f
#define INV_Y 7.5500f
-#define INV_BORDER {{2632, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2632, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2633, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2634, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2635, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2636, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
+#define INV_BORDER {{2878, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2878, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2879, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2880, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2881, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2882, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
#define INV_NBORDER 6
-#define INV_FRAME {2637, 4.0479f, -7.1963f, 1.0f, 1.0f}
-#define INV_ARROW_L {2638, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
-#define INV_ARROW_R {2638, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_L {2639, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_R {2639, 18.0400f, -0.4300f, 1.0000f, 1.0000f}
+#define INV_FRAME {2883, 4.0479f, -7.1963f, 1.0f, 1.0f}
+#define INV_ARROW_L {2884, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
+#define INV_ARROW_R {2884, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_L {2885, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_R {2885, 18.0400f, -0.4300f, 1.0000f, 1.0000f}
#define INV_PANE_NAME {3.9500f, -0.0745f, 8.3290f}
#define INV_PANE_NAME_L {-9.4745f, -0.0646f, 8.3290f}
#define INV_PANE_NAME_R {17.6945f, -0.0646f, 8.3290f}
-#define TXT_INV_PANES {173, 174, 175, 176}
-#define CH_BB {2640, -7.9200f, -8.3700f, 1.0000f, 1.0000f}
+#define TXT_INV_PANES {195, 196, 197, 198}
+#define CH_BB {2886, -7.9200f, -8.3700f, 1.0000f, 1.0000f}
#define CH_BB_POS {{-7.9200f, -8.3700f}, {-6.4200f, -8.3700f}, {-4.9200f, -8.3400f}, {-3.4200f, -8.3400f}, {-1.9200f, -8.3400f}, {-0.4200f, -8.3400f}, {1.0800f, -8.3400f}, {2.5800f, -8.3400f}, {4.0800f, -8.3400f}, {5.5800f, -8.3400f}, {-7.0100f, -9.7900f}, {-5.5100f, -9.7900f}, {-4.0100f, -9.7900f}, {-2.5100f, -9.7900f}, {-1.0100f, -9.7900f}, {0.4900f, -9.7900f}, {1.9900f, -9.7900f}, {3.4900f, -9.7900f}, {4.9900f, -9.7900f}, {6.4900f, -9.7900f}, {-7.9200f, -11.2600f}, {-6.4200f, -11.2600f}, {-4.9200f, -11.2600f}, {-3.4200f, -11.2600f}, {-1.9200f, -11.2600f}, {-0.4200f, -11.2600f}, {1.0800f, -11.2600f}, {2.5800f, -11.2600f}, {4.0800f, -11.2600f}, {5.5800f, -11.2600f}, {-7.0100f, -12.7200f}, {-5.5100f, -12.7200f}, {-4.0100f, -12.7200f}, {-2.5100f, -12.7200f}, {-1.0100f, -12.7200f}, {0.4900f, -12.7200f}, {1.9900f, -12.7200f}, {3.4900f, -12.7200f}, {4.9900f, -12.7200f}, {6.4900f, -12.7200f}}
#define CH_BB_BOX {1.5002f, 1.4969f, -0.0257f, 0.0685f}
#define CH_BB_CHARM {2, 1, 4, 20, 19, 21, 31, 37, 3, 35, 23, 24, 25, 33, 14, 15, 32, 18, 13, 6, 12, 5, 11, 10, 22, 7, 34, 8, 9, 27, 29, 17, 16, 28, 26, 39, 30, 38, 40, 36}
-#define CH_GLOW {2641, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
+#define CH_GLOW {2887, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
#define CH_GLOW_A 0.6970f
-#define CH_ICONS {-1, 2605, 2606, 2607, 2608, -1, 2609, 2610, 2611, -1, -1, -1, -1, -1, 2612, -1, -1, -1, 2613, 2614, 2615, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define CH_NEXT_DOT {2642, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_ICONS {-1, 2851, 2852, 2853, 2854, -1, 2855, 2856, 2857, -1, -1, -1, -1, -1, 2858, -1, -1, -1, 2859, 2860, 2861, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CH_NEXT_DOT {2888, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define CH_NEXT_DOT_BOX {1.2143f, 1.2736f, -0.0209f, 0.0123f}
#define CH_EQ_BOX {1.4950f, 1.4950f, 0.0000f, 0.0000f}
#define CH_TEXT_EQUIPPED {-8.1273f, -2.0957f, 5.4345f}
-#define CH_NOTCH_FULL {2643, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
-#define CH_NOTCH_EMPTY {2644, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_FULL {2889, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_EMPTY {2890, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define CH_NOTCH_X -7.8000f
#define CH_NOTCH_Y -6.1600f
#define CH_NOTCH_DX 0.8100f
#define CH_NOTCH_FULL_RGB {255, 216, 0}
#define CH_NOTCH_OVER_RGB {255, 36, 67}
#define CH_TEXT_NOTCHES {-8.0272f, -5.0757f, 5.4345f}
-#define CH_DIVIDER {2645, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
+#define CH_DIVIDER {2891, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}
-#define CH_COST_PIP {2643, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_COST_PIP {2889, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define CH_COST_X 11.2300f
#define CH_COST_Y -3.6600f
#define CH_COST_DX 0.7500f
@@ -997,59 +1042,59 @@
#define CH_NAME {12.4800f, -2.2710f, 8.8867f}
#define CH_DESC {8.0382f, -7.3673f, 8.8867f}
#define CH_CONFIRM {15.7465f, -13.0221f, 15.3500f}
-#define CH_CONFIRM_KEY {2646, 16.3208f, -13.2878f, 1.0f, 1.0f}
+#define CH_CONFIRM_KEY {2892, 16.3208f, -13.2878f, 1.0f, 1.0f}
#define CH_CONFIRM_KEY_W 0.6412f
-#define CH_CURSOR {2647, 0.0000f, 0.0000f, 1.0000f, 0.9756f}
+#define CH_CURSOR {2893, 0.0000f, 0.0000f, 1.0000f, 0.9756f}
#define CH_CURSOR_K {1.0720f, 1.0458f}
#define CH_CURSOR_CORNERS {{1.0000f, 1.0000f}, {-1.1000f, 1.0000f}, {1.0000f, -1.0089f}, {-1.1000f, -1.0089f}}
-#define TXT_CHARM_TXT_EQUIPPED 177
-#define TXT_CHARM_TXT_OVERCHARMED 178
-#define TXT_CHARM_TXT_COST 179
-#define TXT_CTRL_EQUIP 180
-#define TXT_CTRL_UNEQUIP 181
-#define TXT_CHARM_ALERT_NONE 182
-#define TXT_CHARM_ALERT_NONE_BENCH 183
-#define TXT_CHARM_NOTCHES 184
-#define TXT_CHARM_NAMES_INV {-1, 185, 186, 187, 188, -1, 189, 190, 191, -1, -1, -1, -1, -1, 192, -1, -1, -1, 193, 194, 195, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define TXT_CHARM_DESCS {-1, 196, 197, 198, 199, -1, 200, 201, 202, -1, -1, -1, -1, -1, 203, -1, -1, -1, 204, 205, 206, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define TXT_KEY_OK 207
-#define INV_FIXED {{2648, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2649, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2650, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2651, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2652, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2653, -5.7200f, -13.3200f, 1.0000f, 1.0000f}}
-#define INV_FIXED_BG {{-1, 0, 0, 0, 0}, {-1, 0, 0, 0, 0}, {-1, 0, 0, 0, 0}, {2654, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2655, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}
+#define TXT_CHARM_TXT_EQUIPPED 199
+#define TXT_CHARM_TXT_OVERCHARMED 200
+#define TXT_CHARM_TXT_COST 201
+#define TXT_CTRL_EQUIP 202
+#define TXT_CTRL_UNEQUIP 203
+#define TXT_CHARM_ALERT_NONE 204
+#define TXT_CHARM_ALERT_NONE_BENCH 205
+#define TXT_CHARM_NOTCHES 206
+#define TXT_CHARM_NAMES_INV {-1, 207, 208, 209, 210, -1, 211, 212, 213, -1, -1, -1, -1, -1, 214, -1, -1, -1, 215, 216, 217, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define TXT_CHARM_DESCS {-1, 218, 219, 220, 221, -1, 222, 223, 224, -1, -1, -1, -1, -1, 225, -1, -1, -1, 226, 227, 228, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define TXT_KEY_OK 229
+#define INV_FIXED {{2894, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2895, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2896, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2897, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2898, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2899, -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}, {2900, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2901, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}
#define INV_FIXED_BOX {{1.9363f, 2.9287f, -0.0651f, 0.0923f}, {1.4420f, 1.4140f, -0.0546f, 0.0682f}, {1.6244f, 5.3245f, 0.0126f, 0.1884f}, {1.7500f, 1.7500f, 0.0000f, 0.0000f}, {1.8505f, 1.8756f, -0.0503f, 0.0629f}, {7.8215f, 1.4409f, 1.7816f, -0.0205f}}
-#define INV_HEART_PIECES {{2656, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2657, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2658, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2659, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
-#define INV_VESSEL_PIECES {{2660, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2661, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2662, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}
+#define INV_HEART_PIECES {{2902, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2903, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2904, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2905, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
+#define INV_VESSEL_PIECES {{2906, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2907, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2908, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}
#define INV_GEO_TEXT {-4.8612f, -12.9979f, 1.6942f}
#define INV_EQ_X 1.1000f
#define INV_EQ_Y -3.8000f
#define INV_EQ_DX 2.0800f
#define INV_EQ_DY -2.1800f
-#define INV_EQ {{2663, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2664, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2665, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2666, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2667, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2668, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}
+#define INV_EQ {{2909, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2910, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2911, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2912, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2913, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2914, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}
#define INV_EQ_BOX {{1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}}
-#define INV_TRINKETS {{2669, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2670, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2671, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2672, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}
+#define INV_TRINKETS {{2915, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2916, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2917, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2918, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}
#define INV_TRINKET_BOX {{1.3970f, 1.7141f, 0.0000f, -0.1535f}, {1.3970f, 1.7141f, 0.0000f, -0.1535f}, {1.3970f, 1.7141f, 0.0000f, -0.1535f}, {1.2162f, 1.5101f, -0.0416f, -0.0832f}}
#define INV_TRINKET_TEXT {0.3740f, -0.2538f, 1.3871f}
-#define INV_TRINKET_BB {2673, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
-#define INV_DIVIDERS {{2674, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2674, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}
+#define INV_TRINKET_BB {2919, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
+#define INV_DIVIDERS {{2920, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2920, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}
#define INV_NAME {12.9500f, -1.9345f, 8.3290f}
#define INV_DESC {9.2144f, -3.1678f, 7.6475f}
-#define TXT_INV_HEART {{208, 209}, {210, 211}, {212, 213}, {210, 214}, {210, 215}, {216, 217}}
-#define TXT_INV_VESSEL {{208, 209}, {218, 219}, {220, 221}, {218, 222}, {223, 224}}
-#define TXT_INV_FIXED {{225, 226}, {227, 228}, {229, 230}, {231, 232}}
-#define TXT_INV_EQ {{233, 234}, {235, 236}, {237, 238}, {239, 240}, {241, 242}, {243, 244}}
-#define TXT_INV_QUILL {245, 246, 247, 248}
-#define TXT_INV_TRINKETS {{249, 250}, {251, 252}, {253, 254}, {255, 256}}
-#define SHOP_BACKBOARD {2675, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
-#define SHOP_MASK_TOP {2676, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
-#define SHOP_MASK_BOTTOM {2677, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
-#define SHOP_ARROW_U {2678, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
-#define SHOP_ARROW_D {2678, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
-#define SHOP_SELECTOR {2679, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
-#define SHOP_CONFIRM_GEO {2680, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
-#define SHOP_POINTER_L {2681, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
-#define SHOP_POINTER_R {2681, 6.6249f, -2.0798f, -1.0000f, 1.0000f}
+#define TXT_INV_HEART {{230, 231}, {232, 233}, {234, 235}, {232, 236}, {232, 237}, {238, 239}}
+#define TXT_INV_VESSEL {{230, 231}, {240, 241}, {242, 243}, {240, 244}, {245, 246}}
+#define TXT_INV_FIXED {{247, 248}, {249, 250}, {251, 252}, {253, 254}}
+#define TXT_INV_EQ {{255, 256}, {257, 258}, {259, 260}, {261, 262}, {263, 264}, {265, 266}}
+#define TXT_INV_QUILL {267, 268, 269, 270}
+#define TXT_INV_TRINKETS {{271, 272}, {273, 274}, {275, 276}, {277, 278}}
+#define SHOP_BACKBOARD {2921, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
+#define SHOP_MASK_TOP {2922, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
+#define SHOP_MASK_BOTTOM {2923, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
+#define SHOP_ARROW_U {2924, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
+#define SHOP_ARROW_D {2924, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
+#define SHOP_SELECTOR {2925, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
+#define SHOP_CONFIRM_GEO {2926, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_L {2927, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_R {2927, 6.6249f, -2.0798f, -1.0000f, 1.0000f}
#define SHOP_MASK_A {0, 0, 255, 255, 255, 255, 255, 254, 249, 230, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 81, 134, 182, 206, 226, 223, 0, 0, 0, 0, 0, 0}
#define SHOP_CONFIRM_ITEM {5.0900f, 2.4700f}
-#define TXT_KEY_BACK 258
+#define TXT_KEY_BACK 280
#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}}
@@ -1066,7 +1111,7 @@
#define SHOP_T_ACT_CONFIRM {8.2400f, -6.4868f, 1.8022f}
#define SHOP_T_ACT_CANCEL {2.0402f, -6.4868f, 1.8022f}
#define SHOP_DESC_DY 1.6100f
-#define SHOP_PEG {2682, 5.5100f, 2.5800f, 1.0000f, 1.0000f}
+#define SHOP_PEG {2928, 5.5100f, 2.5800f, 1.0000f, 1.0000f}
#define SHOP_PEG_DX 0.7500f
#define SHOP_PEGS_X {1.9100f, 1.5400f, 1.1500f, 0.8000f, 0.3300f, 0.0000f}
#define SHOP_KEY_CONFIRM {9.0416f, -6.7556f}
@@ -1077,24 +1122,24 @@
#define SHOP_ROW_TOP 4.9000f
#define SHOP_ROW_BOTTOM -5.2500f
#define SHOP_ARROW_BOB 0.1500f
-#define TXT_SHOP_CTRL_BUY 261
-#define TXT_SHOP_CTRL_EXIT 262
-#define TXT_SHOP_CTRL_CONFIRM 263
-#define TXT_SHOP_CTRL_CANCEL 264
-#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 265
-#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 266
-#define TXT_SHOP_CHARM_TXT_NOTCHCOST 267
-#define TXT_SHOP_YES 268
-#define TXT_SHOP_NO 269
+#define TXT_SHOP_CTRL_BUY 283
+#define TXT_SHOP_CTRL_EXIT 284
+#define TXT_SHOP_CTRL_CONFIRM 285
+#define TXT_SHOP_CTRL_CANCEL 286
+#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 287
+#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 288
+#define TXT_SHOP_CHARM_TXT_NOTCHCOST 289
+#define TXT_SHOP_YES 290
+#define TXT_SHOP_NO 291
#define SHOP_DESC_BOTTOM -5.0500f
-#define SHOP_ITEMS {{2684, 0.5714f, 270, 271, 150, 1, 125, -1, 0, 0}, {2684, 0.5714f, 270, 272, 500, 1, 126, 125, 0, 0}, {2685, 0.5714f, 273, 274, 550, 3, 127, -1, 0, 0}, {2686, 0.5714f, 275, 276, 950, 10, 128, -1, 0, 0}, {2687, 0.5714f, 277, 278, 300, 2, 37, -1, 0, 1}, {2688, 0.5714f, 279, 280, 200, 2, 40, -1, 0, 4}, {2689, 0.5714f, 281, 282, 1800, 0, 119, -1, 0, 0}, {2690, 0.5714f, 283, 284, 60, 11, 129, -1, 0, 0}, {2691, 0.5714f, 285, 286, 220, 2, 38, -1, 0, 2}, {2692, 0.5714f, 287, 288, 120, 0, 2, -1, 0, 0}, {2693, 0.5714f, 289, 290, 40, 9, 130, 10, 0, 0}, {2693, 0.5714f, 291, 292, 80, 9, 131, 28, 0, 0}, {2694, 0.5714f, 293, 294, 100, 16, 133, -1, 0, 0}, {2695, 0.5714f, 295, 296, 100, 16, 134, -1, 0, 0}, {2696, 0.5714f, 297, 298, 100, 16, 135, -1, 0, 0}, {2697, 0.5714f, 299, 300, 100, 16, 137, 147, 0, 0}, {2698, 0.5714f, 301, 302, 100, 16, 136, -1, 0, 0}, {2699, 0.5714f, 303, 304, 100, 17, 139, -1, 0, 0}, {2700, 0.5714f, 305, 306, 100, 17, 140, -1, 0, 0}, {2701, 0.5714f, 307, 308, 100, 17, 141, 14, 0, 0}, {2702, 0.5714f, 309, 310, 210, 17, 142, 14, 0, 0}, {2703, 0.5714f, 311, 312, 250, 2, 44, -1, 0, 8}, {2704, 0.5714f, 313, 314, 300, 2, 54, -1, 0, 18}, {2705, 0.5714f, 315, 316, 120, 2, 50, -1, 0, 14}, {2706, 0.5714f, 317, 318, 220, 2, 55, -1, 0, 19}, {2707, 0.5714f, 319, 320, 800, 2, 43, -1, 0, 7}, {2708, 0.5714f, 321, 322, 120, 8, 143, -1, 5, 0}, {2708, 0.5714f, 321, 322, 500, 8, 144, -1, 10, 0}, {2708, 0.5714f, 321, 322, 900, 8, 145, -1, 18, 0}, {2708, 0.5714f, 321, 323, 1400, 8, 146, -1, 25, 0}}
+#define SHOP_ITEMS {{2930, 0.5714f, 292, 293, 150, 1, 125, -1, 0, 0}, {2930, 0.5714f, 292, 294, 500, 1, 126, 125, 0, 0}, {2931, 0.5714f, 295, 296, 550, 3, 127, -1, 0, 0}, {2932, 0.5714f, 297, 298, 950, 10, 128, -1, 0, 0}, {2933, 0.5714f, 299, 300, 300, 2, 37, -1, 0, 1}, {2934, 0.5714f, 301, 302, 200, 2, 40, -1, 0, 4}, {2935, 0.5714f, 303, 304, 1800, 0, 119, -1, 0, 0}, {2936, 0.5714f, 305, 306, 60, 11, 129, -1, 0, 0}, {2937, 0.5714f, 307, 308, 220, 2, 38, -1, 0, 2}, {2938, 0.5714f, 309, 310, 120, 0, 2, -1, 0, 0}, {2939, 0.5714f, 311, 312, 40, 9, 130, 10, 0, 0}, {2939, 0.5714f, 313, 314, 80, 9, 131, 28, 0, 0}, {2940, 0.5714f, 315, 316, 100, 16, 133, -1, 0, 0}, {2941, 0.5714f, 317, 318, 100, 16, 134, -1, 0, 0}, {2942, 0.5714f, 319, 320, 100, 16, 135, -1, 0, 0}, {2943, 0.5714f, 321, 322, 100, 16, 137, 147, 0, 0}, {2944, 0.5714f, 323, 324, 100, 16, 136, -1, 0, 0}, {2945, 0.5714f, 325, 326, 100, 17, 139, -1, 0, 0}, {2946, 0.5714f, 327, 328, 100, 17, 140, -1, 0, 0}, {2947, 0.5714f, 329, 330, 100, 17, 141, 14, 0, 0}, {2948, 0.5714f, 331, 332, 210, 17, 142, 14, 0, 0}, {2949, 0.5714f, 333, 334, 250, 2, 44, -1, 0, 8}, {2950, 0.5714f, 335, 336, 300, 2, 54, -1, 0, 18}, {2951, 0.5714f, 337, 338, 120, 2, 50, -1, 0, 14}, {2952, 0.5714f, 339, 340, 220, 2, 55, -1, 0, 19}, {2953, 0.5714f, 341, 342, 800, 2, 43, -1, 0, 7}, {2954, 0.5714f, 343, 344, 120, 8, 143, -1, 5, 0}, {2954, 0.5714f, 343, 344, 500, 8, 144, -1, 10, 0}, {2954, 0.5714f, 343, 344, 900, 8, 145, -1, 18, 0}, {2954, 0.5714f, 343, 345, 1400, 8, 146, -1, 25, 0}}
#define SHOP_FIRST {0, 8, 21, 30}
-#define SHOP_ROW_GEO {2683, 1.4551f, 0.0000f, 1.0000f, 1.0000f}
+#define SHOP_ROW_GEO {2929, 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 {325, 326, 327}
+#define SHOP_NOSTOCK {347, 348, 349}
#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}
@@ -1102,6 +1147,37 @@
#define COLLECT_GLOW {0.0263f, -0.0329f, -0.5000f, 2.0000f}
#define COLLECT_PIECE {{0.1200f, 0.1000f, 0.0000f, 1.0000f}, {-0.0016f, -0.2000f, -1.0000f, 1.0216f}}
#define COLLECT_MOVER_TO {-7.7000f, 6.0400f}
+#define STAG_AT {0.3000f, 0.3000f}
+#define STAG_K 1.2646f
+#define STAG_BACKING {2955, -0.4427f, 0.0000f, 1.0000f, 0.6408f}
+#define STAG_BACKING_A 0.9020f
+#define STAG_PIECES {{2956, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2957, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2958, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {2959, 0.4147f, 1.5909f, 1.0000f, 1.0000f}}
+#define STAG_OPENED {-1, 155, 156}
+#define STAG_MARKS {{2.9379f, 3.7471f}, {4.8742f, 2.0690f}, {-0.4360f, 2.7790f}}
+#define STAG_SELECTOR {0.0000f, 0.0000f, 1.1797f, 1.2092f}
+#define STAG_MAP_KNIGHT {2960, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define STAG_MAP_SHADOW {2961, 0.0110f, -0.0100f, 1.0000f, 0.9227f}
+#define STAG_T_ROW {-7.5992f, 4.9095f, 5.8145f}
+#define STAG_ROW_DY 1.0000f
+#define STAG_POINTER_R {2962, 2.8680f, 0.6180f, -1.0000f, 1.0000f}
+#define STAG_POINTER_L {2962, -2.8680f, 0.6180f, 1.0000f, 1.0000f}
+#define STAG_ROW {-7.5992f, 3.9576f}
+#define STAG_LIST_KNIGHT {2960, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
+#define STAG_DIVIDER {2963, -7.6003f, 5.2734f, -1.0000f, -0.8696f}
+#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}
+#define TXT_STAG_STATIONS 350
+#define TXT_STAG_NAMES {351, 311, 313}
+#define STAG_NAMES_STR {118, 117, 121}
+#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 352
+#define STAG_T_ACT_CANCEL {11.1713f, -5.3525f, 15.3500f}
+#define STAG_KEY_CANCEL {11.7464f, -5.6213f}
+#define TXT_STAG_CTRL_CANCEL 286
+#define STAG_SCENES_STR {131, 130, 132}
+#define STAG_SCENES_ROOM {4, 19, 36}
#define ROOM_ZONES {2, 4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 22, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6}
#define MSG_FIREBALL 0
#define MSG_DASH 1
diff --git a/games/hollowknight/src/enemy.c b/games/hollowknight/src/enemy.c
index e9ef63a4..2b240af8 100644
--- a/games/hollowknight/src/enemy.c
+++ b/games/hollowknight/src/enemy.c
@@ -1713,16 +1713,16 @@ static int hitbox_touch(const Enemy *e, float x0, float y0, float x1, float y1)
/* ---------------------------------------------------------------- shockwaves (the shockwave FSM, its spurts) */
#define MAX_WAVES 4
#define MAX_SPURTS 32
-typedef struct {
- bool on, spurting;
+typedef struct { /* (its small fields together: many at once) */
float x, y, speed, inc, scale, t;
+ bool on, spurting;
int8_t dir;
} Wave;
typedef struct {
- bool on;
float x, y, scale, t;
- int8_t dir;
Anim anim;
+ bool on;
+ int8_t dir;
} Spurt;
static Wave waves[MAX_WAVES];
static Spurt spurts[MAX_SPURTS];
@@ -2729,7 +2729,7 @@ static void fk_update(Enemy *e) {
case FK_DEATH_ANIM:
if (e->t0 >= 1) {
/* Open Map Shop and Journal; Steam */
- pd_set_flag(PDF_MAPPER_SHOP, true);
+ pd_set_flag(PDF_OPENED_MAPPER_SHOP, true);
pd_set_flag(PDF_CORN_CROSSROADS_LEFT, true);
e->flags |= 1;
cam_shake(SHAKE_BIG);
diff --git a/games/hollowknight/src/game.c b/games/hollowknight/src/game.c
index a59d2cc8..580efcea 100644
--- a/games/hollowknight/src/game.c
+++ b/games/hollowknight/src/game.c
@@ -30,16 +30,32 @@ void game_new(void) {
inv_reset();
shop_reset();
collect_reset();
+ stag_reset();
death_reset();
white_blanker_reset();
}
-bool game_enter(int room, float x, float y, bool facing_right) {
- if (!room_load(room)) return false;
+/* a room just loaded: no triggers in yet, gates whose objects a PlayerData bool turns off (a box flagged 2 after the
+ * gate: the bool, off if it is true or false), the world's things */
+static void door_reset(void);
+static void room_entered(void) {
memset(inside, 0, sizeof inside);
+ door_reset();
memset(ent_off, 0, sizeof ent_off);
- prompts_reset();
+ prompts_reset(); /* (PromptMarker.RecycleOnLevelLoad) */
+ int n;
+ const Ent *es = room_ents(&n);
+ if (n > MAX_ENTS) n = MAX_ENTS;
+ for (int i = 0; i < n; i++)
+ if (es[i].type == ENT_GATE)
+ for (int j = i + 1; j < n && es[j].type == ENT_BOX; j++)
+ if ((es[j].flags & 2) && pd_flag((int)es[j].p0) == (es[j].p1 != 0)) ent_set_enabled(i, false);
world_enter();
+}
+
+bool game_enter(int room, float x, float y, bool facing_right) {
+ if (!room_load(room)) return false;
+ room_entered();
hero_init(x, y, facing_right);
cam_init();
world_hero_in_position();
@@ -54,10 +70,7 @@ bool game_respawn(void) {
for (int i = 0; i < NUM_ROOMS && room < 0; i++)
if (!strcmp(room_name(i), g_pd.respawn_scene)) room = i;
if (room < 0 || !room_load(room)) return false;
- memset(inside, 0, sizeof inside);
- memset(ent_off, 0, sizeof ent_off);
- prompts_reset();
- world_enter();
+ room_entered();
float x = g_room.h->w / 2, y = g_room.h->h / 2;
bool right = g_pd.respawn_facing_right;
int n;
@@ -144,10 +157,7 @@ static void scene_load(void) {
Game *g = &g_game;
g->scene_phase = SP_NONE;
if (!room_load(g->next_room)) return;
- memset(inside, 0, sizeof inside);
- memset(ent_off, 0, sizeof ent_off);
- prompts_reset(); /* (PromptMarker.RecycleOnLevelLoad) */
- world_enter();
+ room_entered();
int n;
const Ent *es = room_ents(&n);
const char *want = str_at(g->next_entry);
@@ -156,7 +166,7 @@ static void scene_load(void) {
if (e->type != ENT_GATE || strcmp(str_at(e->s0), want)) continue;
float gx = (e->x0 + e->x1) / 2, gy = (e->y0 + e->y1) / 2;
for (int j = i + 1; j < n && es[j].type == ENT_BOX; j++)
- if (es[j].flags & 1) gx = es[j].x0, gy = es[j].y0;
+ if (es[j].flags == 1) gx = es[j].x0, gy = es[j].y0;
hero_enter_scene(i, gate_kind(e), gx, gy, e->p1, e->p2, e->flags, g->next_delay + e->p0);
return;
}
@@ -172,6 +182,85 @@ static void scene_tick(float real_dt) {
if (g->scene_t >= 0.5f) scene_load();
}
+/* ---------------------------------------------------------------- doors (Door Control) */
+/* a door's record (a box flagged 4 after its gate): its prompt's place (x0, y0), Crossroads Ascent (x1), Over Hero (y1);
+ * the pause entering (p0), its prompt (p1: Enter, Ascend, Descend); the room it leads to (a), the gate there (s1) */
+static const int16_t door_labels[] = {TXT_PROMPT_ENTER, TXT_PROMPT_ASCEND, TXT_PROMPT_DESCEND};
+static struct {
+ int16_t ent; /* the door whose prompt is up (-1: none) */
+ int8_t prompt;
+ bool entering, visited;
+ float t; /* entering: since */
+ float clock; /* since the Knight finished entering the room (Wait for enter scene, Pause, Init) */
+} door;
+
+static const Ent *door_rec(int i) {
+ int n;
+ const Ent *es = room_ents(&n);
+ for (int j = i + 1; j < n && es[j].type == ENT_BOX; j++)
+ if (es[j].flags == 4) return &es[j];
+ return NULL;
+}
+
+static void door_reset(void) { door.ent = -1, door.prompt = -1, door.entering = false, door.clock = 0; }
+
+/* (Can Enter?: HeroController.CanInteract) */
+static bool hero_can_interact(void) {
+ const Hero *h = &g_hero;
+ const CState *c = &h->cs;
+ return h->accepting_input && h->state != HS_NO_INPUT && !c->dashing && !c->attacking && !h->control_relinquished &&
+ !c->hazard_death && !c->hazard_respawning && !c->recoil_frozen && !c->recoiling && !c->transitioning &&
+ c->on_ground;
+}
+
+static void door_trigger(int i, int kind) {
+ const Ent *d = door_rec(i);
+ if (!d || door.entering) return;
+ if (kind == EV_EXIT) {
+ /* (Out of range: Idle) */
+ if (door.ent == i) prompt_hide(door.prompt), door.ent = -1;
+ return;
+ }
+ /* (Idle until its pauses are over: 1 s; a Crossroads Ascent's 3.5, or 10 the first time; then In Range) */
+ float wait = 0.2f + (d->x1 != 0 ? (door.visited ? 3.5f : 10) : 1);
+ if (door.clock < wait || d->a == 0xFFFF) return;
+ if (door.ent != i) {
+ int l = (int)d->p1;
+ door.ent = (int16_t)i;
+ door.prompt = (int8_t)prompt_show(-1, door_labels[l >= 0 && l < 3 ? l : 0], d->x0, d->y0);
+ }
+ uint32_t p = g_hero.keys & ~g_hero.prev_keys;
+ if (!(p & (K_UP | K_DOWN))) return;
+ if (!hero_can_interact()) {
+ /* (Cancel Frame: the prompt down, then Idle) */
+ prompt_hide(door.prompt), door.ent = -1;
+ return;
+ }
+ /* (Enter Anim?, Enter: the Knight's Enter (or Exit, over him) clip, his control gone, the camera's FADE OUT) */
+ door.entering = true, door.t = 0;
+ hero_relinquish_control();
+ hero_stop_anim_control();
+ anim_play(&g_hero.anim, d->y1 != 0 ? CLIP_KNIGHT_EXIT : CLIP_KNIGHT_ENTER);
+ g_pd.disable_pause = true;
+ game_fade(1, 0.33f, 0);
+}
+
+static void door_tick(void) {
+ if (!door.entering) {
+ if (world_hero_placed() && !g_hero.cs.transitioning) {
+ /* (Init's Visited Check, after the first pause) */
+ if (door.clock < 0.2f && door.clock + 0.02f >= 0.2f) door.visited = pd_flag(PDF_VISITED_CROSSROADS);
+ door.clock += 0.02f;
+ }
+ return;
+ }
+ /* (half a second; then Change Scene) */
+ if ((door.t += 0.02f) < 0.5f || g_game.scene_phase != SP_NONE) return;
+ const Ent *d = door_rec(door.ent);
+ hero_start_anim_control();
+ if (d) game_transition(d->a, d->s1, GATE_DOOR, d->p0, false);
+}
+
static void trigger_event(int i, const Ent *e, int kind) {
Hero *h = &g_hero;
switch (e->type) {
@@ -180,7 +269,8 @@ static void trigger_event(int i, const Ent *e, int kind) {
else cam_lock(i); /* (Enter and Stay) */
break;
case ENT_GATE:
- if (kind == EV_ENTER) gate_touched(e);
+ if (e->flags & G_DOOR) door_trigger(i, kind);
+ else if (kind == EV_ENTER) gate_touched(e);
break;
case ENT_HAZARD_TRIGGER:
if (kind == EV_ENTER) {
@@ -207,7 +297,7 @@ static void triggers_tick(void) {
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 & 1)) in |= x1 > es[j].x0 && x0 < es[j].x1 && y1 > es[j].y0 && y0 < es[j].y1;
+ if (j == i || es[j].flags == 0) in |= x1 > es[j].x0 && x0 < es[j].x1 && y1 > es[j].y0 && y0 < es[j].y1;
bool was = inside[i >> 3] >> (i & 7) & 1;
if (off) in = false;
if (in) inside[i >> 3] |= (uint8_t)(1 << (i & 7));
@@ -302,6 +392,7 @@ static void step(uint32_t keys) {
hero_fixed(keys);
enemies_fixed();
triggers_tick();
+ door_tick();
hero_check_damage();
hero_update();
fireballs_tick();
diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.h
index af7b43c6..de06f521 100644
--- a/games/hollowknight/src/game.h
+++ b/games/hollowknight/src/game.h
@@ -38,7 +38,8 @@ enum {
PDF_HAS_MARKER_R, PDF_HAS_MARKER_Y, PDF_HAS_MARKER_W, PDF_SALUBRA_NOTCH1, PDF_SALUBRA_NOTCH2, PDF_SALUBRA_NOTCH3,
PDF_SALUBRA_NOTCH4, PDF_MET_STAG, PDF_CORNIFER_AT_HOME, PDF_ISELDA_CONVO1, PDF_ISELDA_CORNIFER_HOME_CONVO,
PDF_SALUBRA_CONVO_COMBO, PDF_SALUBRA_CONVO_OVERCHARM, PDF_SALUBRA_CONVO_TRUTH, PDF_SLY_CONVO_MAPPER,
- PDF_COUNT
+ PDF_OPENED_CROSSROADS, PDF_OPENED_GREENPATH, PDF_TRAVELLING, PDF_STAG_REMEMBER1, PDF_STAG_CONVO_TISO,
+ PDF_QUIRREL_LEFT_EGG_TEMPLE, PDF_COUNT
};
typedef struct {
/* (saved: the layout only ever grows into reserved) */
@@ -70,7 +71,9 @@ typedef struct {
uint8_t grubs_collected, grub_rewards; /* (grubsCollected, grubRewards: the Grubfather's given) */
uint8_t equipped[12]; /* (equippedCharms: in the order they were equipped; 0 ends it) */
uint8_t current_inv_pane; /* (currentInvPane) */
- uint8_t reserved[32];
+ uint8_t stag_position1; /* (stagPosition + 1: 0 none yet, 1 Dirtmouth, 2 Crossroads, 3 Greenpath) */
+ uint8_t stations_opened; /* (stationsOpened) */
+ uint8_t reserved[30];
/* (saved apart, by the objects' names: their states) */
uint8_t persist[MAX_PERSIST / 8];
/* (not saved) */
@@ -151,6 +154,7 @@ void world_enter(void); /* the room's objects, as the room s
void world_tick(void); /* 1/50 s */
void world_trigger(int ent, int kind); /* the Knight entering, staying in, leaving an object's trigger (EV_*) */
void world_hero_in_position(void); /* the Knight done entering the room (WaitForHeroInPosition) */
+bool world_hero_placed(void); /* (he is: since the room loaded) */
void world_send_hit(int ent); /* HIT to an object's FSM (from another's) */
void group_fade(int group, float alpha, float time); /* iTweenFadeTo (linear) */
bool persist_get(int bit); /* an object's state in the save (PersistentBoolItem) */
@@ -332,6 +336,16 @@ void vm_enter(void);
void vm_tick(void);
void vm_draw(void);
void vm_broadcast(int ev);
+void vm_send(int obj, int ev); /* (an object's FSMs) */
+void vm_fsm_set(int fsm, int var, uint32_t v, int ev); /* (an FSM's variable set, then an event to it) */
+/* the stag's menu and its rides (stag.c): Open Stag's menu for an FSM (its choice to that variable, then CONTINUE);
+ * nextScene; Cinematic_Stag_travel (the screen black, then the new room's door_stagExit) */
+void stag_reset(void);
+void stag_menu_open(int fsm, int var);
+void stag_next_scene(int str);
+void stag_travel(void);
+uint32_t stag_tick(uint32_t keys); /* -> the keys the game has (none while the menu is open) */
+bool stag_busy(void);
void vm_spell(float x0, float y0, float x1, float y1); /* (a spell's box: the triggers it is in) */
void vm_nail(const float *pts, int npts); /* (the nail's slash: the triggers it meets) */
void piece_spawn(int sprite, int layer, int order, int flags, float x, float y, float z, float rot, float gravity,
@@ -436,6 +450,11 @@ void dialogue_box_down(void);
void dialogue_dream_box(bool up); /* Box Open Dream: BOX UP DREAM, BOX DOWN DREAM */
void dialogue_centre(bool on); /* (SetTextMeshProAlignment: the text centred, or to the left) */
void dialogue_start(int text);
+/* the yes or no box (Box Open YN, Text YN): its question, its toll (TakeGeo on YES), who hears YES or NO (a VM object) */
+void dialogue_box_up_yn(void);
+void dialogue_start_yn(int text);
+void dialogue_yn_toll(int cost);
+void dialogue_yn_requester(int obj);
bool dialogue_finished(void);
bool dialogue_box_shown(void);
void dialogue_cancel(void);
diff --git a/games/hollowknight/src/hk.h b/games/hollowknight/src/hk.h
index f1bd3bc2..4f86d584 100644
--- a/games/hollowknight/src/hk.h
+++ b/games/hollowknight/src/hk.h
@@ -173,6 +173,7 @@ bool phys_ray(float x, float y, float dx, float dy, float dist, uint8_t mask, Ph
uint8_t phys_col_flags(int col);
bool phys_tile_solid(int x, int y);
void phys_collider_enable(int col, bool on); /* (a breakable's: off when it breaks) */
+void phys_collider_shift(int col, float dx, float dy); /* (moved with its object: by so much from its place) */
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);
diff --git a/games/hollowknight/src/main.c b/games/hollowknight/src/main.c
index 2fd96162..91a9cc7f 100644
--- a/games/hollowknight/src/main.c
+++ b/games/hollowknight/src/main.c
@@ -58,7 +58,7 @@ int main(void) {
acc += now - last, last = now;
int ticks = 0;
while (acc >= TICK_MS && ticks < MAX_TICKS) {
- if (!menu_tick(keys)) game_tick(shop_tick(inv_tick(keys)));
+ if (!menu_tick(keys)) game_tick(stag_tick(shop_tick(inv_tick(keys))));
acc -= TICK_MS, ticks++, perf_updates++;
}
if (ticks == MAX_TICKS) acc = 0; /* (too slow to catch up: the game slows down instead) */
diff --git a/games/hollowknight/src/phys.c b/games/hollowknight/src/phys.c
index cf18514d..7b639b86 100644
--- a/games/hollowknight/src/phys.c
+++ b/games/hollowknight/src/phys.c
@@ -28,7 +28,42 @@ void phys_collider_enable(int col, bool on) {
else g_col_off[col >> 3] |= (uint8_t)(1 << (col & 7));
}
-void phys_colliders_reset(void) { memset(g_col_off, 0, sizeof g_col_off); }
+/* colliders that move with their objects (a lift): how far from where the room has them, their segments (found once) */
+#define MAX_SHIFTS 2
+static struct {
+ uint8_t col;
+ uint16_t seg0, nseg;
+ float dx, dy;
+} g_shift[MAX_SHIFTS];
+static int g_nshift;
+
+void phys_colliders_reset(void) {
+ memset(g_col_off, 0, sizeof g_col_off);
+ g_nshift = 0;
+}
+
+static bool col_moved(uint8_t col) {
+ for (int m = 0; m < g_nshift; m++)
+ if (g_shift[m].col == col) return true;
+ return false;
+}
+
+static void ground_init(void);
+void phys_collider_shift(int col, float dx, float dy) {
+ if (col <= 0 || col >= 256) return;
+ ground_init();
+ int i = 0;
+ while (i < g_nshift && g_shift[i].col != col) i++;
+ if (i == g_nshift) {
+ int s0 = -1, s1 = -1;
+ for (int k = 0; k < g_room.h->nseg; k++)
+ if (g_seg_col[k] == col) s1 = k, s0 = s0 < 0 ? k : s0;
+ if (i == MAX_SHIFTS || s0 < 0) return;
+ g_shift[i].col = (uint8_t)col, g_shift[i].seg0 = (uint16_t)s0, g_shift[i].nseg = (uint16_t)(s1 - s0 + 1);
+ g_nshift++;
+ }
+ g_shift[i].dx = dx, g_shift[i].dy = dy;
+}
static void ground_init(void) {
if (g_room_ground == g_room.id) return;
@@ -85,12 +120,26 @@ static int gather(float x0, float y0, float x1, float y1, uint8_t mask, Cand *ou
for (int k = g_cell_first[cy * gw + cx], e = g_cell_first[cy * gw + cx + 1]; k < e; k++) {
int i = g_cell_list[k];
uint8_t col = g_seg_col[i];
- if (!(g_cols[col] & mask) || (g_col_off[col >> 3] >> (col & 7) & 1) || n == MAX_CAND) continue;
+ if (!(g_cols[col] & mask) || (g_col_off[col >> 3] >> (col & 7) & 1) || n == MAX_CAND || (g_nshift && col_moved(col)))
+ continue;
const Seg *s = &g_segs[i];
float ax = s->x0 * UNIT, ay = s->y0 * UNIT, bx = s->x1 * UNIT, by = s->y1 * UNIT;
if ((ax < x0 && bx < x0) || (ax > x1 && bx > x1) || (ay < y0 && by < y0) || (ay > y1 && by > y1)) continue;
out[n++] = (Cand){ax, ay, bx, by, col};
}
+ /* (the moved ones, where they are now) */
+ for (int m = 0; m < g_nshift; m++) {
+ uint8_t col = g_shift[m].col;
+ if (!(g_cols[col] & mask) || (g_col_off[col >> 3] >> (col & 7) & 1)) continue;
+ for (int i = g_shift[m].seg0, e = i + g_shift[m].nseg; i < e && n < MAX_CAND; i++) {
+ if (g_seg_col[i] != col) continue;
+ const Seg *s = &g_segs[i];
+ float ax = s->x0 * UNIT + g_shift[m].dx, ay = s->y0 * UNIT + g_shift[m].dy;
+ float bx = s->x1 * UNIT + g_shift[m].dx, by = s->y1 * UNIT + g_shift[m].dy;
+ if ((ax < x0 && bx < x0) || (ax > x1 && bx > x1) || (ay < y0 && by < y0) || (ay > y1 && by > y1)) continue;
+ out[n++] = (Cand){ax, ay, bx, by, col};
+ }
+ }
if (!(g_cols[0] & mask)) return n;
int tx0 = (int)floorf(x0) - 1, tx1 = (int)floorf(x1) + 1, ty0 = (int)floorf(y0) - 1, ty1 = (int)floorf(y1) + 1;
if (tx0 < 0) tx0 = 0;
diff --git a/games/hollowknight/src/stag.c b/games/hollowknight/src/stag.c
new file mode 100644
index 00000000..afceedc4
--- /dev/null
+++ b/games/hollowknight/src/stag.c
@@ -0,0 +1,209 @@
+/*
+ * The stag's menu (Stag Map: the stations opened, a map of them, the selector at the chosen one) and its rides
+ * (Cinematic_Stag_travel: its film left out, the screen kept black as long, then the new room's door_stagExit).
+ * Its places in HUD units from the menu's (tools/stag.py); it opens growing to its full size.
+ */
+#include <math.h>
+#include "game.h"
+
+#pragma GCC optimize("Os")
+
+#define DT 0.02f
+#define HUD_PX (FOCAL / (-1.342f - CAM_Z))
+#define NSTATIONS 3
+#define RESERVE 80 /* (the frame's instances kept for it) */
+
+typedef struct {
+ float x, y, kx, ky;
+ int16_t up, down;
+ float delay;
+} Border;
+
+static const UiPiece backing = STAG_BACKING, pieces[NSTATIONS + 1] = STAG_PIECES, map_knight = STAG_MAP_KNIGHT,
+ map_shadow = STAG_MAP_SHADOW, ptr_l = STAG_POINTER_L, ptr_r = STAG_POINTER_R,
+ list_knight = STAG_LIST_KNIGHT, divider = STAG_DIVIDER;
+static const UiText t_row = STAG_T_ROW, t_stations = STAG_T_STATIONS, t_act_confirm = STAG_T_ACT_CONFIRM,
+ t_act_cancel = STAG_T_ACT_CANCEL;
+static const float at[2] = STAG_AT, marks[NSTATIONS][2] = STAG_MARKS, selector[4] = STAG_SELECTOR, row0[2] = STAG_ROW,
+ key_confirm[2] = STAG_KEY_CONFIRM, key_cancel[2] = STAG_KEY_CANCEL;
+static const int16_t opened[NSTATIONS] = STAG_OPENED, names[NSTATIONS] = TXT_STAG_NAMES,
+ names_str[NSTATIONS] = STAG_NAMES_STR;
+static const Border borders[2] = {STAG_BORDER_TOP, STAG_BORDER_BOTTOM};
+
+enum { SG_CLOSED, SG_OPEN, SG_CHOSEN };
+static struct {
+ uint8_t st, n, cur, init, fsm, var;
+ uint8_t rows[NSTATIONS]; /* (the stations listed: their numbers) */
+ bool cancel;
+ float t; /* since it opened; then in SG_CHOSEN */
+ float rep;
+ uint32_t prev;
+ Anim border[2], sel;
+ /* the ride */
+ bool riding;
+ int16_t next_scene;
+ float ride_t;
+} sg;
+
+bool stag_busy(void) { return sg.st != SG_CLOSED || sg.riding; }
+void stag_reset(void) { memset(&sg, 0, sizeof sg); }
+void stag_next_scene(int str) { sg.next_scene = (int16_t)str; }
+
+static void stag_draw(void);
+
+void stag_menu_open(int fsm, int var) {
+ if (sg.st != SG_CLOSED) return;
+ /* (UI List Stag: the stations opened, in order; the one the stag is at first (Initial Item, Cancel Item)) */
+ sg.n = 0, sg.init = 0;
+ int at_station = (int)g_pd.stag_position1 - 1;
+ for (int i = 0; i < NSTATIONS; i++) {
+ if (opened[i] >= 0 && !pd_flag(opened[i])) continue;
+ if (i == at_station) sg.init = sg.n;
+ sg.rows[sg.n++] = (uint8_t)i;
+ }
+ sg.cur = sg.init, sg.fsm = (uint8_t)fsm, sg.var = (uint8_t)var;
+ sg.st = SG_OPEN, sg.t = 0, sg.rep = 0, sg.cancel = false;
+ sg.prev = g_hero.keys;
+ /* (Up: the HUD out; Border Display: its clips up; the selector's clip) */
+ hud_slide(true);
+ for (int i = 0; i < 2; i++) anim_play_from_frame(&sg.border[i], borders[i].up, 0);
+ anim_play(&sg.sel, CLIP_STAGUI_STAG_MAP_SELECTION_CURSOR);
+}
+
+void stag_travel(void) {
+ /* (StagTravel: the film at least 3.5 s, skipped after 1.5) */
+ sg.riding = true, sg.ride_t = 0;
+ sg.prev = g_hero.keys;
+}
+
+static const int16_t scenes_str[NSTATIONS] = STAG_SCENES_STR, scenes_room[NSTATIONS] = STAG_SCENES_ROOM;
+static int room_named(int str) {
+ for (int i = 0; i < NSTATIONS; i++)
+ if (scenes_str[i] == str) return scenes_room[i];
+ return -1;
+}
+
+uint32_t stag_tick(uint32_t keys) {
+ uint32_t pressed = keys & ~sg.prev;
+ sg.prev = keys;
+ if (sg.riding) {
+ sg.ride_t += DT;
+ if (sg.ride_t >= 3.5f || (sg.ride_t >= 1.5f && (pressed & (K_OK | K_BACK | K_JUMP | K_ATTACK)))) {
+ sg.riding = false;
+ int room = room_named(sg.next_scene);
+ if (room >= 0) game_transition(room, STR_DOOR_STAGEXIT, GATE_DOOR, 0, false);
+ }
+ return 0;
+ }
+ if (sg.st == SG_CLOSED) return keys;
+ g_gfx_overlay = stag_draw, g_gfx_reserve = RESERVE;
+ sg.t += DT;
+ for (int i = 0; i < 2; i++) sg.border[i].events = 0, anim_update(&sg.border[i], DT);
+ sg.sel.events = 0;
+ anim_update(&sg.sel, DT);
+ if (sg.st == SG_CHOSEN) {
+ /* (Selection Made: its pause, a cancel's 0.2 s; then the menu gone at once, its choice to who asked) */
+ if (sg.t >= (sg.cancel ? 0.2f : 0.15f)) {
+ sg.st = SG_CLOSED;
+ g_gfx_overlay = NULL, g_gfx_reserve = 0;
+ vm_fsm_set(sg.fsm, sg.var, (uint32_t)names_str[sg.rows[sg.cur]], VMEV_CONTINUE);
+ }
+ return 0;
+ }
+ if (sg.t < 0.5f) return 0; /* (the list active after half a second) */
+ /* ui_list: up and down (again after 0.25 s held, then each 0.15 s), round */
+ uint32_t ud = keys & (K_UP | K_DOWN);
+ int move = 0;
+ if (!ud) sg.rep = 0;
+ else if (pressed & ud) sg.rep = 0.25f, move = (pressed & K_DOWN) ? 1 : -1;
+ else if ((sg.rep -= DT) <= 0) sg.rep = 0.15f, move = (keys & K_DOWN) ? 1 : -1;
+ if (move && sg.n) sg.cur = (uint8_t)((sg.cur + sg.n + move) % sg.n);
+ if (pressed & K_OK) sg.st = SG_CHOSEN, sg.t = 0;
+ else if (pressed & K_BACK) sg.st = SG_CHOSEN, sg.t = 0, sg.cancel = true, sg.cur = sg.init;
+ return 0;
+}
+
+/* ---------------------------------------------------------------- drawing: on the HUD, over all */
+static float grow(void) {
+ /* (Up: iTweenScaleTo from 1 to its size, half a second, ease out) */
+ float u = sg.t >= 0.5f || sg.st == SG_CHOSEN ? 1 : sinf(sg.t / 0.5f * 1.5707964f);
+ return (1 + (STAG_K - 1) * u) / STAG_K;
+}
+
+static void put(int sprite, float x, float y, float kx, float ky, uint8_t tint) {
+ float g = grow();
+ Inst in;
+ sprite_inst(sprite, at[0] + x * g, at[1] + y * g, 0, kx * g, ky * g, tint, &in);
+ gfx_overlay(&in);
+}
+static void put_piece(const UiPiece *p, float dx, float dy, uint8_t tint) { put(p->sprite, p->x + dx, p->y + dy, p->kx, p->ky, tint); }
+
+static void put_text(int text, int style, const UiText *t, float dy, int align, float a) {
+ float g = grow();
+ UiText u = {at[0] + t->x * g, at[1] + (t->top + dy) * g, t->w * g};
+ ui_text_at(text, style, &u, 0, 0, align, a);
+}
+
+/* a text's width, HUD units */
+static float width_of(int text, int style) {
+ const uint8_t *s = text_get(text);
+ return text_width(style, s, (int)strlen((const char *)s)) / HUD_PX;
+}
+
+/* an action's key (ActionButtonIcon: the calculator's, by name) -> its left (from the menu's place) */
+static float key_box(const float *k, int name, float a, uint8_t white) {
+ const uint8_t *st = font_style(STYLE_MSG);
+ const uint8_t *s = text_get(name);
+ float w = text_width(STYLE_MSG, s, 2), g = grow();
+ float x = at[0] + k[0] * g, y = at[1] + k[1] * g;
+ Inst in;
+ sprite_inst(SPRITE_MSG_KEY, x, y, 0, (w / HUD_PX + 0.3f) / 0.95f, 0.75f, white, &in);
+ gfx_overlay(&in);
+ gfx_text(STYLE_MSG, VIEW_W / 2 + x * HUD_PX - w / 2, VIEW_H / 2 - y * HUD_PX + (font_asc(st) - font_desc(st)) / 2, s, 2,
+ (uint32_t)(a * 255 + 0.5f) << 24 | 0xFFFFFF, 0);
+ return k[0] - (w / HUD_PX + 0.3f) / 2;
+}
+
+/* an action's text, ending before its key (the text bigger than the game's: kept clear of it) */
+static void act_text(int text, const UiText *t, float key_left) {
+ UiText u = *t;
+ if (u.x > key_left - 0.15f) u.x = key_left - 0.15f;
+ put_text(text, STYLE_MSG, &u, 0, 2, 1);
+}
+
+static void stag_draw(void) {
+ /* the Faders: up over half a second; the map's pieces the same; the selector after half a second */
+ float fade = sg.st == SG_CHOSEN ? 1 : fminf(1, sg.t / 0.5f), sel_a = fminf(1, fmaxf(0, (sg.t - 0.5f) / 0.5f));
+ if (sg.st == SG_CHOSEN) sel_a = 1;
+ uint8_t white = gfx_dyn_tint(29, 255, 255, 255, 255), faded = gfx_dyn_tint(30, 255, 255, 255, (uint8_t)(fade * 255));
+ put_piece(&backing, 0, 0, gfx_dyn_tint(31, 255, 255, 255, (uint8_t)(fade * STAG_BACKING_A * 255)));
+ /* the map: its core, the pieces of the stations opened */
+ put_piece(&pieces[0], 0, 0, faded);
+ for (int i = 0; i < sg.n; i++) put_piece(&pieces[1 + sg.rows[i]], 0, 0, faded);
+ /* the Knight's icon (and its shadow) at the station it is at, the selector at the chosen one (MARKER UP: as the
+ * list is active) */
+ if (sg.t >= 0.5f || sg.st == SG_CHOSEN) {
+ const float *m = marks[sg.rows[sg.init]], *c = marks[sg.rows[sg.cur]];
+ put_piece(&map_shadow, m[0], m[1], gfx_dyn_tint(24, 0, 0, 0, 255));
+ put_piece(&map_knight, m[0], m[1], white);
+ if (sg.sel.sprite >= 0) put(sg.sel.sprite, c[0], c[1], selector[2], selector[3], gfx_dyn_tint(25, 255, 255, 255, (uint8_t)(sel_a * 255)));
+ }
+ /* the list: its title and divider, its rows, the pointers at the current one, the Knight's icon by his station */
+ put_piece(&divider, 0, 0, faded);
+ put_text(TXT_STAG_STATIONS, STYLE_MSG, &t_stations, 0, 1, fade);
+ for (int i = 0; i < sg.n; i++) put_text(names[sg.rows[i]], STYLE_TUTE, &t_row, -i * STAG_ROW_DY, 1, fade);
+ /* (the names bigger than the game's: the icon and the pointers kept clear of them) */
+ float kx = fminf(list_knight.x, row0[0] - width_of(names[sg.rows[sg.init]], STYLE_TUTE) / 2 - 0.6f) - list_knight.x;
+ put_piece(&list_knight, kx, -sg.init * STAG_ROW_DY, white);
+ if (sg.t >= 0.5f || sg.st == SG_CHOSEN) {
+ float y = row0[1] - sg.cur * STAG_ROW_DY;
+ float px = fmaxf(ptr_r.x, width_of(names[sg.rows[sg.cur]], STYLE_TUTE) / 2 + 0.4f);
+ put_piece(&ptr_l, row0[0] - px - ptr_l.x, y, white);
+ put_piece(&ptr_r, row0[0] + px - ptr_r.x, y, white);
+ /* the action keys (Buttons: after half a second) */
+ act_text(TXT_STAG_CTRL_TRAVEL, &t_act_confirm, key_box(key_confirm, TXT_KEY_OK, 1, white));
+ act_text(TXT_STAG_CTRL_CANCEL, &t_act_cancel, key_box(key_cancel, TXT_KEY_BACK, 1, white));
+ }
+ for (int i = 0; i < 2; i++)
+ if (sg.border[i].sprite >= 0) put(sg.border[i].sprite, borders[i].x, borders[i].y, borders[i].kx, borders[i].ky, white);
+}
diff --git a/games/hollowknight/src/text.c b/games/hollowknight/src/text.c
index ee0b4f1a..efb7d57b 100644
--- a/games/hollowknight/src/text.c
+++ b/games/hollowknight/src/text.c
@@ -84,10 +84,16 @@ float text_box(int text, int style, float x, float y, float w, int align, float
#define MAX_PAGES 24
#define KEYS_CONTINUE (K_JUMP | K_ATTACK | K_SPELL | K_FOCUS | K_DASH | K_OK | K_BACK | K_PAUSE | K_MAP | K_INV)
-enum { PC_IDLE, PC_PAGE_END, PC_STOP_PAUSE, PC_CONV_END, PC_SFX, PC_END };
+#define YN_BOX_Y 1.94f /* (Box Open YN: the box lower) */
+#define YN_TEXT_Y 1.89f /* (Text YN: its rect's center, its height; its lines centred) */
+#define YN_TEXT_H 3.9055f
+
+enum { PC_IDLE, PC_PAGE_END, PC_STOP_PAUSE, PC_CONV_END, PC_SFX, PC_END, PC_YN_PAUSE, PC_YN_LIST, PC_YN_CHOSEN };
static struct {
- /* Box Open: the box's scale (iTweenScaleTo) and its FadeGroup (0.5 s up, 0.3 s down, to 0.6) */
- bool up;
+ /* Box Open: the box's scale (iTweenScaleTo) and its FadeGroup (0.5 s up, 0.3 s down, to 0.6); its place (Box Open
+ * YN's lower, the HUD left as it is) and its text's */
+ bool up, yn_box;
+ float box_y, text_y, text_h;
float scale, scale_from, scale_to, scale_t, scale_time;
float alpha, fade_t;
Anim fleur_top, fleur_bot;
@@ -109,6 +115,12 @@ static struct {
Anim dream;
bool dream_on, centre;
float dream_off;
+ /* Text YN: its Dialogue Page Control (the toll shown, its UI List of Yes and No, TakeGeo), who hears YES or NO */
+ bool yn, geo_on, cancel;
+ uint8_t yn_cur; /* (ui_list's Current Item: 1 Yes, 2 No) */
+ int16_t toll, requester;
+ float yn_t, rep;
+ Anim coin;
} dl;
static float ease_sine(float t, bool out) { return out ? sinf(t * 1.5707964f) : 1 - cosf(t * 1.5707964f); }
@@ -117,10 +129,10 @@ static void box_scale_to(float to, float time) {
dl.scale_from = dl.scale, dl.scale_to = to, dl.scale_t = 0, dl.scale_time = time;
}
-void dialogue_box_up(void) {
- /* (Box Up) */
- dl.up = true;
- hud_slide(true);
+static void box_up(bool yn) {
+ dl.up = true, dl.yn_box = yn;
+ dl.box_y = yn ? YN_BOX_Y : BOX_Y;
+ if (!yn) hud_slide(true);
box_scale_to(1, 0.5f);
dl.fade_t = 0;
anim_play_from_frame(&dl.fleur_top, CLIP_DIALOGUE_FLEUR_TOP_UP, 0);
@@ -128,10 +140,13 @@ void dialogue_box_up(void) {
dl.fleurs_on = true;
}
+void dialogue_box_up(void) { box_up(false); } /* (Box Up) */
+void dialogue_box_up_yn(void) { box_up(true); } /* (Box Open YN's Box Up) */
+
void dialogue_box_down(void) {
if (!dl.up) return;
dl.up = false;
- hud_slide(false);
+ if (!dl.yn_box) hud_slide(false);
box_scale_to(0.75f, 0.3f);
dl.fade_t = 0;
anim_play_from_frame(&dl.fleur_top, CLIP_DIALOGUE_FLEUR_TOP_DOWN, 0);
@@ -155,7 +170,7 @@ void dialogue_dream_box(bool up) {
void dialogue_centre(bool on) { dl.centre = on; }
static int lines_per_page(const uint8_t *st) {
- float h = TEXT_H * HUD_PX * TEXT_K;
+ float h = dl.text_h * HUD_PX * TEXT_K;
return 1 + (int)((h - font_asc(st) - font_desc(st)) / font_line(st));
}
@@ -193,6 +208,7 @@ static void show_page(int p) {
void dialogue_start(int text) {
/* StartConversation */
+ dl.yn = false, dl.text_y = TEXT_Y, dl.text_h = TEXT_H;
set_conversation(text_get(text));
dl.finished = false;
dl.pc = PC_IDLE;
@@ -200,6 +216,18 @@ void dialogue_start(int text) {
show_page(0);
}
+/* (Text YN's StartConversation: its question, then Yes and No) */
+void dialogue_start_yn(int text) {
+ dl.yn = true, dl.text_y = YN_TEXT_Y, dl.text_h = YN_TEXT_H;
+ set_conversation(text_get(text));
+ dl.finished = false, dl.geo_on = false;
+ dl.pc = PC_IDLE;
+ dl.prev_keys = g_hero.keys;
+ show_page(0);
+}
+void dialogue_yn_toll(int cost) { dl.toll = (int16_t)cost; }
+void dialogue_yn_requester(int obj) { dl.requester = (int16_t)obj; }
+
bool dialogue_finished(void) { return dl.finished; }
bool dialogue_box_shown(void) { return dl.up || dl.alpha > 0; }
@@ -242,6 +270,7 @@ void dialogue_tick(void) {
anim_update(&dl.dream, DT);
if (dl.dream_off > 0 && (dl.dream_off -= DT) <= 0) dl.dream_on = false;
}
+ if (dl.geo_on) anim_update(&dl.coin, DT);
if (dl.arrow_on) anim_update(&dl.arrow, DT);
if (dl.stop_on) anim_update(&dl.stop, DT);
if (!dl.text) return;
@@ -252,7 +281,12 @@ void dialogue_tick(void) {
while (dl.reveal >= 1 && dl.visible < last) dl.visible++, dl.reveal -= 1;
if (dl.visible >= last) {
dl.typing = false;
- if (dl.page + 1 >= dl.npages) dl.pc = PC_STOP_PAUSE; /* CONVERSATION_END */
+ if (dl.page + 1 >= dl.npages && dl.yn) {
+ /* (CONVERSATION_END: Activate Geo Text?, a toll's, then a pause; Conversation End: the UI List) */
+ dl.geo_on = dl.toll > 0, dl.yn_t = 0, dl.yn_cur = 1, dl.rep = 0;
+ dl.pc = dl.geo_on ? PC_YN_PAUSE : PC_YN_LIST;
+ if (dl.geo_on) anim_play(&dl.coin, CLIP_HUD_COIN_IDLE);
+ } else if (dl.page + 1 >= dl.npages) dl.pc = PC_STOP_PAUSE; /* CONVERSATION_END */
else {
/* PAGE_END: the arrow up */
dl.pc = PC_PAGE_END;
@@ -290,6 +324,37 @@ void dialogue_tick(void) {
case PC_END:
end_conversation();
break;
+ case PC_YN_PAUSE:
+ if ((dl.yn_t += DT) >= 0.2f) dl.pc = PC_YN_LIST, dl.yn_t = 0;
+ break;
+ case PC_YN_LIST: {
+ /* ui_list: left and right (again after 0.25 s held, then each 0.15 s), round; ui_list_button_listen (after a
+ * quarter second): submit, or cancel (No) */
+ dl.yn_t += DT;
+ uint32_t lr = keys & (K_LEFT | K_RIGHT);
+ if (!lr) dl.rep = 0;
+ else if (pressed & lr) dl.rep = 0.25f, dl.yn_cur = (uint8_t)(3 - dl.yn_cur);
+ else if ((dl.rep -= DT) <= 0) dl.rep = 0.15f, dl.yn_cur = (uint8_t)(3 - dl.yn_cur);
+ if (dl.yn_t < 0.25f) break;
+ if (pressed & K_OK) dl.cancel = false, dl.pc = PC_YN_CHOSEN, dl.yn_t = 0;
+ else if (pressed & K_BACK) dl.cancel = true, dl.yn_cur = 2, dl.pc = PC_YN_CHOSEN, dl.yn_t = 0;
+ break;
+ }
+ case PC_YN_CHOSEN: {
+ /* (Selection Made: half a second, a cancel's 0.2; Yes without the geo for it: Will Cancel, back) */
+ bool short_of = dl.yn_cur == 1 && dl.toll > g_pd.geo;
+ if ((dl.yn_t += DT) < (dl.cancel ? 0.2f : 0.5f)) break;
+ if (short_of) {
+ dl.pc = PC_YN_LIST, dl.yn_t = 0.25f;
+ break;
+ }
+ /* (End Conversation: the text, the list, the toll hidden; Take Geo; YES or NO to who asked) */
+ bool yes = dl.yn_cur == 1;
+ dl.text = NULL, dl.geo_on = false, dl.yn = false, dl.pc = PC_IDLE;
+ if (yes && dl.toll > 0) g_pd.geo -= dl.toll;
+ vm_send(dl.requester, yes ? VMEV_YES : VMEV_NO);
+ break;
+ }
}
}
@@ -297,20 +362,67 @@ static void box_sprite(int sprite, float x, float y, float sx, float sy, uint8_t
/* (placed about the box's place at its scale and the text's; sized at its scale) */
float k = dl.scale * TEXT_K;
Inst in;
- sprite_inst(sprite, BOX_X + (x - BOX_X) * k, BOX_Y + (y - BOX_Y) * k, 0, sx * dl.scale, sy * dl.scale, tint, &in);
+ sprite_inst(sprite, BOX_X + (x - BOX_X) * k, dl.box_y + (y - dl.box_y) * k, 0, sx * dl.scale, sy * dl.scale, tint, &in);
gfx_hud(&in, 0);
}
#define MARKER_K (1.3f * TEXT_K) /* (the arrow's and the stop's scale) */
+/* Text YN's pieces: placed about the lower box's place at the text's scale */
+static float yn_x(float x) { return BOX_X + (x - BOX_X) * TEXT_K; }
+static float yn_y(float y) { return YN_BOX_Y + (y - YN_BOX_Y) * TEXT_K; }
+static void yn_sprite(int sprite, float x, float y, float sx, uint8_t tint) {
+ if (sprite < 0) return;
+ Inst in;
+ sprite_inst(sprite, yn_x(x), yn_y(y), 0, sx, fabsf(sx), tint, &in);
+ gfx_hud(&in, 0);
+}
+/* a word centred on x, its top at the rect's (w x h about (x, y)) */
+static void yn_word(int text, int style, float x, float y, float h, uint32_t rgb) {
+ const uint8_t *s = text_get(text), *st = font_style(style);
+ int n = (int)strlen((const char *)s);
+ float px = VIEW_W / 2 + yn_x(x) * HUD_PX - text_width(style, s, n) / 2;
+ gfx_text(style, px, VIEW_H / 2 - yn_y(y + h / 2) * HUD_PX + font_asc(st), s, n, 0xFF000000u | rgb, 0);
+}
+
+static void yn_draw(uint8_t white) {
+ if (dl.geo_on) {
+ /* the toll (Geo Text: the coin, the count in TrajanPro, its left at its place, middle) */
+ yn_sprite(dl.coin.sprite, -1.22f, 2.2f, 1, white);
+ char buf[8];
+ int n = 0, v = dl.toll;
+ do buf[n++] = (char)('0' + v % 10), v /= 10;
+ while (v && n < 7);
+ static const float adv[10] = DIGIT_ADV;
+ float x = yn_x(-0.573f), y = yn_y(2.01f) + 0.23f;
+ while (n--) {
+ int d = buf[n] - '0';
+ Inst in;
+ sprite_inst(SPRITE_DIGIT0 + d, x, y, 0, 1, 1, white, &in);
+ gfx_hud(&in, 0);
+ x += adv[d];
+ }
+ }
+ if (dl.pc != PC_YN_LIST && dl.pc != PC_YN_CHOSEN) return;
+ /* the UI List: Yes (without the geo for it: Not Enough, grey, and its line), No; the pointers at the current one */
+ static const UiPiece pl = SHOP_POINTER_L, pr = SHOP_POINTER_R;
+ bool short_of = dl.toll > g_pd.geo;
+ yn_word(TXT_YN_YES, STYLE_YN, -4.153f, 0.61f, 1.5622f, short_of ? 0xA5A5A5 : 0xFFFFFF);
+ if (short_of) yn_word(TXT_YN_NOT_ENOUGH, STYLE_MSG, -4.033f, -0.465f, 1.5622f, 0xFFFFFF);
+ yn_word(TXT_YN_NO, STYLE_YN, 3.687f, 0.61f, 1.5622f, 0xFFFFFF);
+ float cx = dl.yn_cur == 1 ? -4.153f : 3.687f;
+ yn_sprite(pl.sprite, cx - 2.014f, 0.81f, pl.kx * TEXT_K, white);
+ yn_sprite(pr.sprite, cx + 2.104f, 0.81f, pr.kx * TEXT_K, white);
+}
+
void dialogue_draw(void) {
if (dl.alpha > 0 || dl.fleurs_on) {
/* the backboard (0.6 of its color's alpha), the fleurs */
uint8_t a = (uint8_t)(dl.alpha * 0.6f * 0.616f * 255);
- if (a) box_sprite(SPRITE_DIALOGUE_BACKBOARD, 0, 4.51f - 0.09f, 1, 1.2527f / 2.325f, gfx_dyn_tint(18, 255, 255, 255, a));
+ if (a) box_sprite(SPRITE_DIALOGUE_BACKBOARD, 0, dl.box_y - 0.09f, 1, 1.2527f / 2.325f, gfx_dyn_tint(18, 255, 255, 255, a));
uint8_t white = gfx_dyn_tint(19, 255, 255, 255, 255);
if (dl.fleurs_on) {
- box_sprite(dl.fleur_top.sprite, 0, 4.51f + 2.85f, TEXT_K, TEXT_K, white);
- box_sprite(dl.fleur_bot.sprite, 0, 4.51f - 2.73f, TEXT_K, TEXT_K, white);
+ box_sprite(dl.fleur_top.sprite, 0, dl.box_y + 2.85f, TEXT_K, TEXT_K, white);
+ box_sprite(dl.fleur_bot.sprite, 0, dl.box_y - 2.73f, TEXT_K, TEXT_K, white);
}
}
uint8_t white = gfx_dyn_tint(20, 255, 255, 255, 255);
@@ -323,18 +435,20 @@ void dialogue_draw(void) {
}
if (dl.arrow_on && dl.arrow.sprite >= 0) box_sprite(dl.arrow.sprite, 0.0069f, 1.695f, MARKER_K, MARKER_K, white);
if (dl.stop_on && dl.stop.sprite >= 0) box_sprite(dl.stop.sprite, -0.0231f, 1.695f, MARKER_K, MARKER_K, white);
+ if (dl.yn) yn_draw(white);
if (!dl.text) return;
/* the page's lines, top left in the rect, as far as the typewriter shows */
const uint8_t *st = font_style(STYLE_DIALOGUE);
- float w = TEXT_W * HUD_PX * TEXT_K, h = TEXT_H * HUD_PX * TEXT_K;
+ float w = TEXT_W * HUD_PX * TEXT_K, h = dl.text_h * HUD_PX * TEXT_K;
float left = VIEW_W / 2 + TEXT_X * HUD_PX - w / 2;
- float y = VIEW_H / 2 - (BOX_Y + (TEXT_Y - BOX_Y) * TEXT_K) * HUD_PX - h / 2 + font_asc(st);
+ float by = dl.yn ? YN_BOX_Y : BOX_Y;
+ float y = VIEW_H / 2 - (by + (dl.text_y - by) * TEXT_K) * HUD_PX - h / 2 + font_asc(st);
int i = dl.page_start[dl.page], last = page_last(), per = lines_per_page(st);
for (int l = 0; l < per && i < last; l++) {
int next, e = line_end(st, dl.text, i, w, &next);
int n = (e < dl.visible ? e : dl.visible) - i;
/* (centred: the whole line's place, as it is typed) */
- float x = dl.centre ? left + (w - text_width(STYLE_DIALOGUE, dl.text + i, e - i)) / 2 : left;
+ float x = dl.centre || dl.yn ? left + (w - text_width(STYLE_DIALOGUE, dl.text + i, e - i)) / 2 : left;
if (n > 0) gfx_text(STYLE_DIALOGUE, x, y, dl.text + i, n, 0xFFFFFFFFu, 0);
if (dl.visible <= e) break;
i = next, y += font_line(st);
@@ -344,6 +458,8 @@ void dialogue_draw(void) {
void dialogue_reset(void) {
memset(&dl, 0, sizeof dl);
dl.scale = 0.75f;
+ dl.box_y = BOX_Y, dl.text_y = TEXT_Y, dl.text_h = TEXT_H;
+ dl.coin.sprite = -1;
dl.arrow.sprite = dl.stop.sprite = dl.dream.sprite = -1;
}
diff --git a/games/hollowknight/src/vm.c b/games/hollowknight/src/vm.c
index ee7096ba..b2f4ec62 100644
--- a/games/hollowknight/src/vm.c
+++ b/games/hollowknight/src/vm.c
@@ -25,7 +25,8 @@ enum { OF_ACTIVE = 1, OF_RENDERER = 2, OF_ANIMATOR = 4, OF_TRIGGER = 8, OF_COLLI
OF_GONE = 32, OF_INSIDE = 64, OF_WAS_INSIDE = 128,
OF_COND_OFF = 256, /* (not there: its condition) */
OF_SPELL_HIT = 512, OF_SPELL_IN = 1024, OF_SPELL_WAS = 2048, /* (a spell in its trigger) */
- OF_NAIL_HIT = 4096, OF_NAIL_IN = 8192, OF_NAIL_WAS = 16384 }; /* (the nail's slash on its collider) */
+ OF_NAIL_HIT = 4096, OF_NAIL_IN = 8192, OF_NAIL_WAS = 16384, /* (the nail's slash on its collider) */
+ OF_STICK = 32768 }; /* (HeroPlatformStick on: the Knight on it goes with it) */
#define OF_ANIM_OFF 32 /* (its record's: off once its clip is over, DeactivateAfter2dtkAnimation) */
#define OF_WAVE 64 /* (its record's: WaveEffectControl, grows and fades as it is on: bx its speed, by its scale) */
#define OF_FADE 128 /* (its record's: SimpleSpriteFade, fades as it is on, then off: bx its time, by the alpha to) */
@@ -97,6 +98,7 @@ static struct {
bool blank_on;
int title;
uint32_t prev_keys;
+ uint32_t touch, touch_was; /* (objects whose colliders the Knight touches, this step and the one before) */
} vm;
/* ---------------------------------------------------------------- the data (VMDEF: definitions, string tables) */
@@ -219,6 +221,8 @@ static int pd_int(int i) {
case 19: return g_pd.ore;
case 20: return g_pd.grubs_collected;
case 21: return g_pd.grub_rewards;
+ case 22: return (int)g_pd.stag_position1 - 1;
+ case 23: return g_pd.stations_opened;
default: return 0;
}
}
@@ -238,6 +242,8 @@ static void pd_set_int(int i, int v) {
case 19: g_pd.ore = (uint8_t)v; break;
case 20: g_pd.grubs_collected = (uint8_t)v; break;
case 21: g_pd.grub_rewards = (uint8_t)v; break;
+ case 22: g_pd.stag_position1 = (uint8_t)(v + 1); break;
+ case 23: g_pd.stations_opened = (uint8_t)v; break;
}
}
@@ -263,6 +269,15 @@ static void obj_pos(int o, float *x, float *y) {
*x = *y = 0;
}
+/* the Knight against one of the object's colliders (his body's contacts) */
+static bool hero_touches(int o) {
+ const ObjRec *rc = &vm.rec[o];
+ const Body *b = &g_hero.body;
+ for (int i = 0; i < b->ncontacts; i++)
+ if (b->ccol[i] >= rc->col0 && b->ccol[i] < rc->col0 + rc->ncol) return true;
+ return false;
+}
+
static void obj_move(int o, float x, float y) {
if (o == O_HERO) {
g_hero.body.x = x, g_hero.body.y = y;
@@ -272,6 +287,12 @@ static void obj_move(int o, float x, float y) {
/* (its children with it) */
float dx = x - vm.objs[o].x, dy = y - vm.objs[o].y;
vm.objs[o].x = x, vm.objs[o].y = y;
+ /* (its colliders with it; the Knight touching them, with HeroPlatformStick on, too) */
+ const ObjRec *rc = &vm.rec[o];
+ if (rc->ncol && (dx != 0 || dy != 0)) {
+ if ((vm.objs[o].flags & OF_STICK) && hero_touches(o)) g_hero.body.x += dx, g_hero.body.y += dy;
+ for (int c = rc->col0; c < rc->col0 + rc->ncol; c++) phys_collider_shift(c, x - rc->x, y - rc->y);
+ }
for (int c = 0; c < vm.nobjs; c++)
if (vm.rec[c].parent == o) obj_move(c, vm.objs[c].x + dx, vm.objs[c].y + dy);
}
@@ -417,6 +438,15 @@ void vm_broadcast(int ev) {
game_event(ev);
}
+static void obj_event(int o, int ev, uint16_t fsm_name);
+void vm_send(int obj, int ev) { obj_event(obj, ev, NONE); }
+/* (the stag's menu: its choice to an FSM's variable, then its event) */
+void vm_fsm_set(int fsm, int var, uint32_t v, int ev) {
+ if (fsm < 0 || fsm >= vm.nfsms) return;
+ set_var(&vm.fsms[fsm], (uint8_t)var, v);
+ fsm_event(&vm.fsms[fsm], ev);
+}
+
static void obj_event(int o, int ev, uint16_t fsm_name) {
if (o >= O_GATE && o < O_GATE + 0x100) {
if (ev >= VMEV_BG_CLOSE && ev <= VMEV_BG_DESTROY) gate_event_at(o - O_GATE, ev - VMEV_BG_CLOSE);
@@ -442,9 +472,16 @@ static void obj_event(int o, int ev, uint16_t fsm_name) {
shop_event(ev); /* (the shop's menu: SHOP UP) */
return;
}
+ if (o == O_MAIN_CAMERA) {
+ /* (CameraFade: FADE OUT, FADE IN) */
+ if (ev == VMEV_FADE_OUT) game_fade(1, 0.33f, 0);
+ else if (ev == VMEV_FADE_IN) game_fade_scene_in();
+ return;
+ }
if (o == O_DIALOGUE_MANAGER) {
if (ev == VMEV_BOX_UP) dialogue_box_up();
- else if (ev == VMEV_BOX_DOWN) dialogue_box_down();
+ else if (ev == VMEV_BOX_DOWN || ev == VMEV_BOX_DOWN_YN) dialogue_box_down();
+ else if (ev == VMEV_BOX_UP_YN) dialogue_box_up_yn();
else if (ev == VMEV_BOX_UP_DREAM) dialogue_dream_box(true);
else if (ev == VMEV_BOX_DOWN_DREAM) dialogue_dream_box(false);
return;
@@ -575,7 +612,86 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
Rd t = r;
r.p += 5;
int ev = rb(&r);
+ r.p += 2;
+ bool every = rb(&r);
send(f, &t, ev);
+ return !every;
+ }
+ case VMOP_SENDEVENTOF: {
+ /* (to itself, the event its string variable names) */
+ uint32_t s = val(f, rv(&r));
+ for (int i = 0, n = rb(&r); i < n; i++) {
+ uint16_t name = rv(&r);
+ int ev = rb(&r);
+ if (name == s) {
+ fsm_event(f, ev);
+ break;
+ }
+ }
+ return true;
+ }
+ case VMOP_HUDSLIDE:
+ hud_slide(rb(&r) != 0);
+ return true;
+ case VMOP_OPENSTAGMENU:
+ stag_menu_open((int)(f - vm.fsms), rb(&r));
+ return true;
+ case VMOP_SETNEXTSCENE:
+ stag_next_scene((int)val(f, rv(&r)));
+ return true;
+ case VMOP_STAGTRAVEL:
+ stag_travel();
+ return true;
+ case VMOP_TRANSLATE: {
+ /* (by so much, a second or at once; every frame: in its updates, not as it starts) */
+ int o = oval(f, rv(&r));
+ uint16_t vx = rv(&r), vy = rv(&r);
+ bool per = rb(&r), every = rb(&r);
+ if (every ? mode == M_UPDATE : enter) {
+ float x, y, k = per ? DT : 1;
+ obj_pos(o, &x, &y);
+ obj_move(o, x + (has(vx) ? fval(f, vx) * k : 0), y + (has(vy) ? fval(f, vy) * k : 0));
+ }
+ return !every;
+ }
+ case VMOP_HEROCOLLISION: {
+ int ev = rb(&r);
+ /* (OnCollisionEnter2D: as he comes against it) */
+ if (mode == M_FIXED && obj_ok(f->owner) && (vm.touch >> f->owner & 1) && !(vm.touch_was >> f->owner & 1)) {
+ fsm_event(f, ev);
+ return true;
+ }
+ return false;
+ }
+ case VMOP_PLATFORMSTICK:
+ if (obj_ok(f->owner))
+ vm.objs[f->owner].flags = (uint16_t)(rb(&r) ? vm.objs[f->owner].flags | OF_STICK : vm.objs[f->owner].flags & ~OF_STICK);
+ return true;
+ case VMOP_WAITFORHEROINPOSITION: {
+ int ev = rb(&r);
+ if (world_hero_placed()) {
+ fsm_event(f, ev);
+ return true;
+ }
+ return false;
+ }
+ case VMOP_SENDTRIGGER2DEVENT: {
+ /* (the Knight coming into its owner's trigger: the event to another) */
+ Rd t = r;
+ r.p += 5;
+ int ev = rb(&r);
+ if (mode == M_FIXED && obj_ok(f->owner) && (vm.objs[f->owner].flags & OF_INSIDE) &&
+ !(vm.objs[f->owner].flags & OF_WAS_INSIDE))
+ send(f, &t, ev);
+ return false;
+ }
+ case VMOP_FREEZEMOMENT: {
+ /* (GameManager.FreezeMoment: its kinds) */
+ int k = rb(&r);
+ if (k == 0) game_freeze(0.01f, 0.35f, 0.1f, 0, false);
+ else if (k == 1) game_freeze(0.04f, 0.03f, 0.04f, 0, false);
+ else if (k == 2) game_freeze(0.25f, 2, 0.25f, 0.15f, false);
+ else game_freeze(0.01f, 0.25f, 0.1f, 0, false);
return true;
}
case VMOP_SETBOOLVALUE: {
@@ -1079,6 +1195,15 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
case VMOP_STARTCONVERSATION:
dialogue_start(rv(&r));
return true;
+ case VMOP_STARTCONVERSATIONYN:
+ dialogue_start_yn(rv(&r));
+ return true;
+ case VMOP_SETTOLL:
+ dialogue_yn_toll((int)val(f, rv(&r)));
+ return true;
+ case VMOP_SETYNREQUESTER:
+ dialogue_yn_requester(oval(f, rv(&r)));
+ return true;
case VMOP_NOTICEICON:
notice_icon(rb(&r));
return true;
@@ -1481,6 +1606,8 @@ void vm_tick(void) {
Obj *o = &vm.objs[i];
o->flags = (uint16_t)((o->flags & ~(OF_WAS_INSIDE | OF_SPELL_WAS | OF_NAIL_WAS)) | ((o->flags & OF_INSIDE) ? OF_WAS_INSIDE : 0) |
((o->flags & OF_SPELL_IN) ? OF_SPELL_WAS : 0) | ((o->flags & OF_NAIL_IN) ? OF_NAIL_WAS : 0));
+ vm.touch_was = (vm.touch_was & ~(1u << i)) | (vm.touch & (1u << i));
+ vm.touch = (vm.touch & ~(1u << i)) | (vm.rec[i].ncol && obj_active(i) && hero_touches(i) ? 1u << i : 0);
bool on = (vm.rec[i].flags & OF_TRIGGER) && (o->flags & OF_COLLIDER) && obj_active(i);
bool in = on && hero_box_in(i), spell = on && (o->flags & OF_SPELL_HIT), nail = on && (o->flags & OF_NAIL_HIT);
o->flags = (uint16_t)((in ? o->flags | OF_INSIDE : o->flags & ~OF_INSIDE) & ~(OF_SPELL_HIT | OF_NAIL_HIT));
diff --git a/games/hollowknight/src/world.c b/games/hollowknight/src/world.c
index 22edc568..484dec80 100644
--- a/games/hollowknight/src/world.c
+++ b/games/hollowknight/src/world.c
@@ -138,6 +138,8 @@ void world_enter(void) {
/* (Pause's WaitForHeroInPosition: the masks start as the Knight is placed; its Wait only counts when it was placed
* already) */
+bool world_hero_placed(void) { return hero_in_position; }
+
void world_hero_in_position(void) {
if (hero_in_position) return;
hero_in_position = true;
diff --git a/games/hollowknight/tests/play.c b/games/hollowknight/tests/play.c
index 61507cd2..3b609500 100644
--- a/games/hollowknight/tests/play.c
+++ b/games/hollowknight/tests/play.c
@@ -63,6 +63,7 @@ int main(int argc, char **argv) {
g_pd.heart_pieces = (uint8_t)hp, g_pd.vessel_fragments = (uint8_t)vf;
}
if (getenv("HKGEO")) g_pd.geo = atoi(getenv("HKGEO"));
+ if (getenv("HKSTAG")) g_pd.stag_position1 = (uint8_t)(atoi(getenv("HKSTAG")) + 1); /* (stagPosition) */
if (getenv("HKFIRE")) g_pd.fireball_level = atoi(getenv("HKFIRE"));
if (getenv("HKHORNETGP")) g_pd.hornet_greenpath = (uint8_t)atoi(getenv("HKHORNETGP"));
if (getenv("HKDASH")) g_pd.has_dash = true;
@@ -124,7 +125,7 @@ int main(int argc, char **argv) {
}
if (getenv("HKPROMPT") && atoi(getenv("HKPROMPT")) == tick)
prompt_show(-1, TXT_PROMPT_LISTEN, g_hero.body.x, g_hero.body.y + 1.5f);
- if (!menu || !menu_tick(keys)) game_tick(shop_tick(inv_tick(keys)));
+ if (!menu || !menu_tick(keys)) game_tick(stag_tick(shop_tick(inv_tick(keys))));
if (trace && menu) printf(" menu in game %d\n", menu_in_game());
if (trace)
printf("%4d keys %02x pos %.3f,%.3f v %.3f,%.3f state %d ground %d jump %d fall %d clip %d frame %d cam %.2f,%.2f\n", tick,
diff --git a/games/hollowknight/tools/actors.py b/games/hollowknight/tools/actors.py
index 38d6492d..7145e268 100644
--- a/games/hollowknight/tools/actors.py
+++ b/games/hollowknight/tools/actors.py
@@ -146,6 +146,9 @@ ACTORS = {"knight": KNIGHT,
"heartui": ("sharedassets10.assets", 592, ["Fleur Appear", "Fleur Disappear", "Get 0", "Get 1", "Get 2", "Get 3",
"Get 4", "Got 1", "Got 2", "Got 3", "Fuse", "Head Move"]),
"vesselui": ("sharedassets10.assets", 542, ["Get 0", "Get 1", "Get 2", "Get 3", "Got 1", "Got 2"]),
+ # the stag's menu: the map's selector, its borders unrolled up and down (on the HUD)
+ "stagui": ("resources.assets", 23333, ["Stag_Map_Selection_Cursor", "Stag_Border_Top Up", "Stag_Border_Top Down",
+ "Stag_Border_Bottom Up", "Stag_Border_Bottom Down"]),
# (Gathering Swarm: the bug that brings geo, a child of each)
"geobug": ("resources.assets", 22564, ["Lamp_Bug_idle"]),
# the dialogue box (on the HUD, a third bigger with its text) and the prompt markers
@@ -227,12 +230,14 @@ DRAWN_SCALE = {"Arrow Up": 1.3, "Arrow Down": 1.3, "Stop Up": 1.3, "Stop Down":
"Blast": 1.4, "Ball": 1.45, "Ball End": 1.45, "Fireball Wall Impact": 2.0,
"Lamp_Bug_idle": 1.5 * 1.4838, "Shop_Menu_Top Up": 1.124, "Shop_Menu_Top Down": 1.124,
"Shop_Menu_Bottom Up": 1.134, "Shop_Menu_Bottom Down": 1.134, "Small Idle": 1.5, "Small Air": 1.5, "Med Idle": 1.5, "Med Air": 1.5, "Large Idle": 1.5, "Large Air": 1.5,
- "Head Move": 2.0, "Death Glow": 2.0}
+ "Head Move": 2.0, "Death Glow": 2.0, "Stag_Map_Selection_Cursor": 1.209,
+ "Stag_Border_Top Up": 1.003, "Stag_Border_Top Down": 1.003, "Stag_Border_Bottom Up": 0.939,
+ "Stag_Border_Bottom Down": 0.939}
K0 = scene.FOCAL / (0.004 - scene.CAMZ) # screen pixels a unit, where actors are (z near 0)
HUD_K = (scene.VIEW_H / 2) / 8.7107 # the HUD's (its orthographic camera)
# (actor, clip): drawn bigger or smaller than their sprites
ACTOR_RES = float(os.environ.get("HK_ACTOR_RES", "1"))
-ACTOR_SCALE = {"hud": HUD_K / K0, "shopui": HUD_K / K0, "liquid": 1.4 * HUD_K / K0, "dialogue": text.TEXT_K * HUD_K / K0}
+ACTOR_SCALE = {"hud": HUD_K / K0, "shopui": HUD_K / K0, "stagui": HUD_K / K0, "liquid": 1.4 * HUD_K / K0, "dialogue": text.TEXT_K * HUD_K / K0}
HUD_MASK = 0.7135
@@ -289,7 +294,7 @@ def build():
col = tk2d.collection(cpath, cpid)
img, lx, ty, upp, (wu, hu) = tk2d.sprite_image(cpath, col, f["spriteId"])
k = K0 * DRAWN_SCALE.get(name, 1.0) * ACTOR_SCALE.get(actor, 1.0)
- if actor not in ("knight", "hud", "dialogue", "liquid", "shopui"):
+ if actor not in ("knight", "hud", "dialogue", "liquid", "shopui", "stagui"):
k *= ACTOR_RES # (the others' frames: a little less fine, to fit)
if actor == "hud" and (name.startswith("Health") or name.startswith("Blue")):
k *= HUD_MASK
diff --git a/games/hollowknight/tools/ents.py b/games/hollowknight/tools/ents.py
index 39cb267a..c6617129 100644
--- a/games/hollowknight/tools/ents.py
+++ b/games/hollowknight/tools/ents.py
@@ -224,6 +224,9 @@ def rec(type_, flags=0, box=(0, 0, 0, 0), p=(0, 0, 0, 0), a=0, group=0, group2=0
return struct.pack(REC, type_, flags, group, group2, a, persist, *box, *p, s0, s1)
+# a door's prompts (src/game.c: door_labels)
+DOOR_PROMPTS = ("Enter", "Ascend", "Descend")
+
# PlayerData bools whose names are not camel case
PD_RAW_NAMES = {"PDF_HORNET_F19": "hornet_f19", "PDF_HAS_MARKER_B": "hasMarker_b", "PDF_HAS_MARKER_R": "hasMarker_r",
"PDF_HAS_MARKER_Y": "hasMarker_y", "PDF_HAS_MARKER_W": "hasMarker_w"}
@@ -1154,6 +1157,20 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0
recs += _more_boxes(o)
# (the gate's own place, where the Knight comes in: a box record flagged 1, not part of its trigger)
recs.append(rec(ENT_BOX, 1, (o["pos"][0], o["pos"][1], o["pos"][0], o["pos"][1])))
+ # (off as the room loads while a PlayerData bool says its object is: flagged 2, the bool, off if true)
+ for flag, off_if in conds(o):
+ recs.append(rec(ENT_BOX, 2, p=(flag, 1 if off_if else 0, 0, 0)))
+ # (a door: its Door Control's scene, gate, pause and prompt; the prompt's place; flagged 4)
+ dc = next((c2["fsm"] for c2 in o["c"] if c2.get("fsm") and c2["fsm"]["name"] == "Door Control" and
+ c2.get("enabled") is not False), None)
+ if v.get("isADoor") and dc:
+ fv = lambda n, dflt=None: (dc["vars"].get(n) or [None, dflt])[1]
+ to = fv("New Scene") or ""
+ pm = next((by_id[c2] for c2 in o.get("children", []) if by_id[c2]["name"] == "Prompt Marker"), o)
+ recs.append(rec(ENT_BOX, 4, (pm["pos"][0], pm["pos"][1], 1 if fv("Crossroads Ascent") else 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 "")))
elif cls == "HazardRespawnTrigger":
box = _trigger(o)
ref = v.get("respawnMarker")
diff --git a/games/hollowknight/tools/pack.py b/games/hollowknight/tools/pack.py
index 0ead3233..71e0ede9 100644
--- a/games/hollowknight/tools/pack.py
+++ b/games/hollowknight/tools/pack.py
@@ -520,12 +520,16 @@ def main():
for i in range(41))
for key, style in (("CHARM_TUTE_TITLE", "TUTE_TITLE"), ("CHARM_TUTE_SUB", "TUTE"), ("CHARM_REMINDER", "TUTE")):
fleurs["TXT_" + key] = TEXTS.add(text.clean(text.sheets()["Prompts"][key]), style)
+ # the yes or no box: Yes, No (Prompts, TextMeshPro 10), Not enough Geo (5)
+ for name, key, style in (("YES", "YES", "YN"), ("NO", "NO", "YN"), ("NOT_ENOUGH", "NOT_ENOUGH_GEO", "MSG")):
+ fleurs["TXT_YN_" + name] = TEXTS.id("Prompts", key, style)
# the title screen, the save profiles, the pause menu; each room's map zone (the save slots' area)
- import menu, inv, shop, collect
+ import menu, inv, shop, collect, stag
fleurs.update(menu.build(SPRITES, TEXTS))
fleurs.update(inv.build(SPRITES, TEXTS, hud_res, vm.CHARMS, charm_icon))
fleurs.update(shop.build(SPRITES, TEXTS, hud_res, actors.clip_id, vm.CHARMS))
fleurs.update(collect.build())
+ fleurs.update(stag.build(SPRITES, TEXTS, hud_res, actors.clip_id, ents.pd_flags(), vm.STR.id, ROOMS))
fleurs["ROOM_ZONES"] = "{%s}" % ", ".join(str(scene.settings(unity.scene(r)).get("map_zone") or 0) for r in ROOMS)
for i, item in enumerate(text.MSGS):
fleurs["MSG_" + item] = i
@@ -704,7 +708,7 @@ def main():
secs["RVAR"].b += rvar
# (the children enemy.c knows by name)
str_ids = {n: STRINGS.id(n) for n in ("Attack Range", "Evade Range", "Spit Range", "Wake Box", "Slash Hitbox",
- "Slash2 Hitbox")}
+ "Slash2 Hitbox", "door_stagExit")}
secs["STR"].b += STRINGS.blob()
secs["TEXT"].b += TEXTS.blob()
secs["FONT"].b += TEXTS.fonts()
diff --git a/games/hollowknight/tools/stag.py b/games/hollowknight/tools/stag.py
new file mode 100644
index 00000000..6a57c44a
--- /dev/null
+++ b/games/hollowknight/tools/stag.py
@@ -0,0 +1,116 @@
+"""The stag's menu (Stag Map: its stations, the map of them, the selector) as the stations of this part of the game have
+it: STAG_* defines for data.h. Its places in HUD units from the menu's (Open Stag puts it at (0.3, 0.3); it grows to
+its full size, the prefab's, as it opens)."""
+import math
+import unity, ents, tk2d, text
+
+MENU = ("resources.assets", 7203)
+AT = (0.3, 0.3)
+# the stations here: their list item, their map piece, the PlayerData bool that opens them (None: open from the start)
+STATIONS = (("Dirtmouth", None), ("Crossroads", "openedCrossroads"), ("Greenpath", "openedGreenpath"))
+SCENES = ("Room_Town_Stag_Station", "Crossroads_47", "Fungus1_16_alt") # (their rooms: Stag Control's To Scene)
+
+
+def build(sprites, texts, res, actor_clip, pd_flags, str_id, rooms):
+ p = unity.prefab(*MENU)
+ by = {o["path"]: o for o in p["objects"]}
+ root = by["Stag Map"]
+ rk = math.hypot(root["m3"][0], root["m3"][3])
+ U = lambda v: "%.4ff" % v
+ out = {}
+ sh = text.sheets()
+
+ def comp(o, cls):
+ return next((c["v"] for c in o["c"] if (c.get("class") or c["type"]) == cls and c.get("v") is not None), None)
+
+ def rel(o):
+ return o["pos"][0] - root["pos"][0], o["pos"][1] - root["pos"][1]
+
+ def piece(path, at=None):
+ """its sprite at its place (from the menu's), its scale: "{sprite, x, y, kx, ky}" """
+ o = by["Stag Map/" + path]
+ x, y = at if at is not None else rel(o)
+ m = o["m3"]
+ sx = math.hypot(m[0], m[3]) * (1 if m[0] >= 0 else -1)
+ sy = math.hypot(m[1], m[4]) * (1 if m[4] >= 0 else -1)
+ s = max(abs(sx), abs(sy))
+ sr = comp(o, "SpriteRenderer")
+ if sr and sr.get("m_Sprite"):
+ spr = sprites.id(p, sr["m_Sprite"], s, res)
+ else:
+ tk = comp(o, "tk2dSprite")
+ cp, cpid = ents._ref_file(p, tk["collection"])
+ col = tk2d.collection(cp, cpid)
+ spr = sprites.tk2d(cp, cpid, unity.S(col["spriteDefinitions"][tk["_spriteId"]]["name"]), s, res)
+ return "{%d, %s, %s, %s, %s}" % (spr, U(x), U(y), U(sx / s), U(sy / s))
+
+ def tx(path):
+ """a text's place, centred (TextMeshPro in its TextContainer, aligned top centre): "{x, top, width}" """
+ o = by["Stag Map/" + path]
+ tc = comp(o, "TextContainer")
+ k = math.hypot(o["m3"][0], o["m3"][3])
+ w, h = tc["m_rect"]["width"] * k, tc["m_rect"]["height"] * k
+ x, y = rel(o)
+ al = comp(o, "TextMeshPro")["m_textAlignment"] % 4
+ x0 = x - tc["m_pivot"]["x"] * w
+ return "{%s, %s, %s}" % (U(x0 + (0, w / 2, w, 0)[al]), U(y + (1 - tc["m_pivot"]["y"]) * h), U(w))
+
+ out["STAG_AT"] = "{%s, %s}" % (U(AT[0]), U(AT[1]))
+ out["STAG_K"] = U(rk) # (its scale, open)
+ out["STAG_BACKING"] = piece("backing")
+ out["STAG_BACKING_A"] = U(comp(by["Stag Map/backing"], "SpriteRenderer")["m_Color"]["a"])
+ # the map: its core, each station's piece (shown as it is opened), the selector at the chosen one's mark (its
+ # move_stagmap_marker's Marker Pos, in the pieces' space), the Knight's icon at the station it is at
+ pr = by["Stag Map/Stag_Map_Pieces"]
+ pk = math.hypot(pr["m3"][0], pr["m3"][3])
+ marks = []
+ for name, _ in STATIONS:
+ fsm = next(c["fsm"] for c in by["Stag Map/UI List Stag/" + name]["c"]
+ if c.get("fsm") and c["fsm"]["name"] == "move_stagmap_marker")
+ mx, my, _ = fsm["vars"]["Marker Pos"][1]
+ marks.append("{%s, %s}" % (U(pr["pos"][0] + mx * pk - root["pos"][0]), U(pr["pos"][1] + my * pk - root["pos"][1])))
+ out["STAG_PIECES"] = "{%s}" % ", ".join(piece("Stag_Map_Pieces/" + n) for n in ["Core"] + [s for s, _ in STATIONS])
+ out["STAG_OPENED"] = "{%s}" % ", ".join(str(pd_flags[b]) if b else "-1" for _, b in STATIONS)
+ out["STAG_MARKS"] = "{%s}" % ", ".join(marks)
+ sel = by["Stag Map/Stag_Map_Pieces/Map_selector"]
+ out["STAG_SELECTOR"] = "{%s, %s, %s, %s}" % (U(0), U(0), U(math.hypot(sel["m3"][0], sel["m3"][3])),
+ U(math.hypot(sel["m3"][1], sel["m3"][4])))
+ out["STAG_MAP_KNIGHT"] = piece("Stag_Map_Pieces/Map_selector/Knight Icon", at=(0, 0))
+ ki, sd = by["Stag Map/Stag_Map_Pieces/Map_selector/Knight Icon"], by["Stag Map/Stag_Map_Pieces/Map_selector/Knight Icon/Shadow"]
+ out["STAG_MAP_SHADOW"] = piece("Stag_Map_Pieces/Map_selector/Knight Icon/Shadow",
+ at=(sd["pos"][0] - ki["pos"][0], sd["pos"][1] - ki["pos"][1]))
+ # the list: its title, its divider, a row each opened station (1.0 apart, the first's place), the pointers either
+ # side of the current one, the Knight's icon by the station it is at
+ first = by["Stag Map/UI List Stag/" + STATIONS[0][0]]
+ out["STAG_T_ROW"] = tx("UI List Stag/" + STATIONS[0][0])
+ out["STAG_ROW_DY"] = U(first["pos"][1] - by["Stag Map/UI List Stag/" + STATIONS[1][0]]["pos"][1])
+ ptr = by["Stag Map/UI List Stag/%s/Pointer R" % STATIONS[0][0]]
+ dx, dy = ptr["pos"][0] - first["pos"][0], ptr["pos"][1] - first["pos"][1]
+ fx, fy = rel(first)
+ out["STAG_POINTER_R"] = piece("UI List Stag/%s/Pointer R" % STATIONS[0][0], at=(dx, dy))
+ out["STAG_POINTER_L"] = piece("UI List Stag/%s/Pointer L" % STATIONS[0][0], at=(-dx, dy))
+ out["STAG_ROW"] = "{%s, %s}" % (U(fx), U(fy))
+ out["STAG_LIST_KNIGHT"] = piece("UI List Stag/Knight Icon")
+ out["STAG_DIVIDER"] = piece("UI List Stag/Divider")
+ out["STAG_T_STATIONS"] = tx("UI List Stag/Stations")
+ out["TXT_STAG_STATIONS"] = texts.add(text.clean(sh["StagMenu"]["STATIONS"]), "MSG")
+ out["TXT_STAG_NAMES"] = "{%s}" % ", ".join(str(texts.add(text.clean(sh["StagMenu"][n.upper()]), "TUTE"))
+ for n, _ in STATIONS)
+ out["STAG_NAMES_STR"] = "{%s}" % ", ".join(str(str_id(n)) for n, _ in STATIONS)
+ # the borders (Border Display: their clips up as it opens)
+ for n in ("Top", "Bottom"):
+ o = by["Stag Map/Border/Stag_Border_" + n]
+ x, y = rel(o)
+ out["STAG_BORDER_" + n.upper()] = "{%s, %s, %s, %s, %s, %s, 0}" % (
+ U(x), U(y), U(math.hypot(o["m3"][0], o["m3"][3])), U(math.hypot(o["m3"][1], o["m3"][4])),
+ actor_clip("stagui", "Stag_Border_%s Up" % n), actor_clip("stagui", "Stag_Border_%s Down" % n))
+ # the action keys: Travel, Cancel (their texts right aligned, their keys' boxes)
+ for n, key in (("CONFIRM", "CTRL_TRAVEL"), ("CANCEL", "CTRL_CANCEL")):
+ out["STAG_T_ACT_" + n] = tx("Buttons/Action %s/Text" % n.capitalize())
+ o = by["Stag Map/Buttons/Action %s/ActionButtonIcon" % n.capitalize()]
+ out["STAG_KEY_" + n] = "{%s, %s}" % (U(rel(o)[0]), U(rel(o)[1]))
+ out["TXT_STAG_" + key] = texts.add(text.clean(sh["UI"][key]), "MSG")
+ # (the rides: the scripts' scene names, the rooms they are)
+ out["STAG_SCENES_STR"] = "{%s}" % ", ".join(str(str_id(s)) for s in SCENES)
+ out["STAG_SCENES_ROOM"] = "{%s}" % ", ".join(str(rooms.index(s)) for s in SCENES)
+ return out
diff --git a/games/hollowknight/tools/state.py b/games/hollowknight/tools/state.py
index 46e17f07..496c7612 100644
--- a/games/hollowknight/tools/state.py
+++ b/games/hollowknight/tools/state.py
@@ -7,12 +7,14 @@ 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}
-DYNAMIC = {"visitedDirtmouth", "tisoEncounteredTown", "hasDash", "hornet1Defeated", "shamanPillar"}
+DYNAMIC = {"visitedDirtmouth", "tisoEncounteredTown", "hasDash", "hornet1Defeated", "shamanPillar", "openedTownBuilding",
+ "slyRescued", "openedMapperShop"}
def conditions(o):
- """An object's DeactivateIfPlayerdata components -> [(bool name, off if true (else off if false))]."""
- out = []
+ """An object's DeactivateIfPlayerdata components (and what its parent's Check Opened makes of it) -> [(bool name,
+ off if true (else off if false))]."""
+ out = list(o.get("_conds", []))
for c in o["c"]:
cl = c.get("class") or ""
if cl in ("DeactivateIfPlayerdataTrue", "DeactivateIfPlayerdataFalse"):
@@ -20,9 +22,24 @@ def conditions(o):
return out
+def _check_opened(o, by):
+ """Check Opened (Dirtmouth's buildings): its "open" child on with the bool, its "closed" one off"""
+ f = next((c["fsm"] for c in o["c"] if c.get("fsm") and c["fsm"]["name"] == "Check Opened"), None)
+ if f is None:
+ return
+ test = next(a for st in f["states"] for a in st["actions"] if a["name"] == "PlayerDataBoolTest")
+ name = dict(test["params"])["boolName"]
+ for ci in o.get("children", []):
+ q = by[ci]
+ if q["name"] in ("open", "closed"):
+ q["_conds"] = [(name, q["name"] == "closed")]
+
+
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"]}
+ for o in d["objects"]:
+ _check_opened(o, by)
for o in d["objects"]:
for name, off_if in conditions(o):
if name in CONSTANT:
diff --git a/games/hollowknight/tools/text.py b/games/hollowknight/tools/text.py
index 33dfd314..5d5bec46 100644
--- a/games/hollowknight/tools/text.py
+++ b/games/hollowknight/tools/text.py
@@ -102,6 +102,8 @@ STYLES = {
"MENU": _style("TrajanPro-Bold", 31 / 6 * 1.6 * 10, 1, *TRAJAN, k=1),
"MENU_TITLE": _style("TrajanPro-Bold", 53 / 6 * 1.35 * 10, 1, *TRAJAN, k=1, phases=1),
"MENU_SMALL": _style("TrajanPro-Regular", 27 / 6 * 1.6 * 10, 1, *TRAJAN, k=1),
+ # the yes or no box's Yes and No (Text YN's UI List: TextMeshPro 10)
+ "YN": _style("Perpetua", 10, HUD_PX, 134.0625, 0, 117, 95.9375, -38.1875),
# a shop's long descriptions, smaller (still bigger than the game's) where the message's size runs out of the window
"MSG_S": _style("Perpetua", 3.73 * 1.4407 * 0.78, HUD_PX, 134.0625, 0, 117, 95.9375, -38.1875),
}
diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.py
index f7894301..bbd226ce 100644
--- a/games/hollowknight/tools/vm.py
+++ b/games/hollowknight/tools/vm.py
@@ -12,8 +12,13 @@ import unity, text, state
ROOMS = {
"Town": ["_NPCs/Elderbug", "_NPCs/Tiso Town NPC"],
"Room_temple": ["Quirrel"],
- "Crossroads_47": ["_NPCs/Tiso Bench NPC"],
+ "Crossroads_47": ["_NPCs/Tiso Bench NPC", "Stag", "_Scenery/Station Bell", "Stag_Tunnel/Stag_tunnel_Grate",
+ "Stag Blanker"],
+ "Fungus1_16_alt": ["Stag", "Station Bell", "Stag_tunnel_Grate", "Stag Blanker"],
+ "Room_Town_Stag_Station": ["Stag", "Station Bell", "Stag_Tunnel/Stag_tunnel_Grate", "Stag Blanker", "Stag Lift",
+ "Station Door", "Gate Switch"],
"Room_ruinhouse": ["Sly Dazed"],
+ "Crossroads_06": ["Set NPC Leave"],
"Fungus1_04": ["Hornet Infected Knight Encounter", "Hornet Saver", "Cloak Corpse", "Dream Scene Activate",
"Dreamer Scene 1"],
"Crossroads_ShamanTemple": ["_Props/Shaman Meeting", "_Props/Shaman Trapped", "_Props/Shaman Killed Blocker",
@@ -97,7 +102,7 @@ def _behaviours(rm, o):
# FSMs left out (what this port does not have: the dream nail, sounds...)
-SKIP_FSMS = {"npc_dream_dialogue", "Dream Dialogue", "Rotate", "Shop Open Voice"}
+SKIP_FSMS = {"npc_dream_dialogue", "Dream Dialogue", "Rotate", "Shop Open Voice", "Enviro Region"}
# objects left out (effects drawn by the C code, or nothing at all; the dream nail's; Dreamer Scene 1's Knight Lift,
# which nothing turns on)
SKIP_CLASSES = {"SpellGetOrb", "ParticleSystem"}
@@ -119,11 +124,15 @@ O_NONE = 0xFFFF
# PlayerData ints (src/vm.c: pd_int)
PD_INTS = ["MPCharge", "health", "maxHealth", "geo", "fireballLevel", "quakeLevel", "screamLevel", "shaman", "elderbug",
"permadeathMode", "nailDamage", "hornetGreenpath", "quirrelEggTemple", "charmsOwned", "trinket1", "trinket2",
- "trinket3", "trinket4", "rancidEggs", "ore", "grubsCollected", "grubRewards"]
+ "trinket3", "trinket4", "rancidEggs", "ore", "grubsCollected", "grubRewards", "stagPosition", "stationsOpened",
+ "xunFlowerBrokeTimes"]
# PlayerData bools kept elsewhere (src/vm.c)
PD_SPECIAL = {"disablePause": 0xFFF0, "hasSpell": 0xFFF1, "canDash": 0xFFF2}
# PlayerData bools that keep their new game value all through this part of the game
-PD_CONST = {"gotSlyCharm": False, "hasAllNailArts": False, "hasNailArt": False, "honedNail": False,
+PD_CONST = {"openedTown": True, "kingsStationNonDisplay": False, "queensStationNonDisplay": False,
+ "stagEggInspected": False, "stagHopeConvo": False, "openedStagNest": False, "stagRemember2": False,
+ "stagRemember3": False, "stagConvoTram": False,
+ "gotSlyCharm": False, "hasAllNailArts": False, "hasNailArt": False, "honedNail": False,
"iseldaConvoGrimm": False, "iseldaNymmConvo": False, "slyConvoGrimm": False, "slyNymmConvo": False,
"slyConvoNailArt": False, "slyConvoNailHoned": False, "backerCredits": False, "finalGrubRewardCollected": False, "gaveSlykey": False, "hasSlykey": False,
"corn_fogCanyonLeft": False, "corn_fungalWastesLeft": False, "corn_cityLeft": False,
@@ -154,6 +163,11 @@ class Strings:
self.list.append(s)
return self.index[s]
+ def truncate(self, n):
+ for s in self.list[n:]:
+ del self.index[s]
+ del self.list[n:]
+
STR = Strings()
EVENTS = Strings()
@@ -161,7 +175,8 @@ for e in ("FINISHED", "CONVO_FINISH", "CONVO START", "CONVO END", "BIG TITLE STA
"NPC TITLE DOWN", "NPC CONVO START", "BOX UP", "BOX DOWN", "LEAVING SCENE", "TAKE DAMAGE", "GET ITEM MSG END",
"HORNET LEAVE", "BG CLOSE", "BG QUICK CLOSE", "BG OPEN", "BG QUICK OPEN", "BG DESTROY", "WAKE", "BOX UP DREAM",
"BOX DOWN DREAM", "FADE IN", "FADE OUT", "FSM CANCEL", "CLOSE", "FK DEATH", "SHOP UP", "SHOP CLOSED",
- "SHOP CLOSED QUICK", "SHOP WINDOW UP", "RESET SHOP WINDOW", "CLOSE SHOP WINDOW"):
+ "SHOP CLOSED QUICK", "SHOP WINDOW UP", "RESET SHOP WINDOW", "CLOSE SHOP WINDOW", "BOX UP YN", "BOX DOWN YN",
+ "YES", "NO", "CONTINUE"):
EVENTS.id(e)
FIXED_EVENTS = len(EVENTS.list) # (src/data.h: VMEV_*)
@@ -179,8 +194,8 @@ def op(name, *params):
op("Nop")
op("Wait", ("time", "f"), ("finishEvent", "e"))
op("NextFrameEvent", ("sendEvent", "e"))
-op("SendEvent", ("eventTarget", "t"), ("sendEvent", "e"), ("delay", "f"))
-op("SendEventByName", ("eventTarget", "t"), ("sendEvent", "es"), ("delay", "f"))
+op("SendEvent", ("eventTarget", "t"), ("sendEvent", "e"), ("delay", "f"), ("everyFrame", "n"))
+op("SendEventByName", ("eventTarget", "t"), ("sendEvent", "es"), ("delay", "f"), ("everyFrame", "n"))
op("SetBoolValue", ("boolVariable", "B"), ("boolValue", "b"), ("everyFrame", "n"))
op("SetFloatValue", ("floatVariable", "F"), ("floatValue", "f"), ("everyFrame", "n"))
op("SetIntValue", ("intVariable", "I"), ("intValue", "i"), ("everyFrame", "n"))
@@ -306,6 +321,22 @@ op("WaitRandom", ("timeMin", "f"), ("timeMax", "f"), ("finishEvent", "e"))
op("FlingPiece", ("gameObject", "o"), ("hide", "n"), ("snap", "n"), ("sprite", "x"), ("layer", "n"), ("order", "x"),
("flags", "n"), ("dx", "k"), ("dy", "k"), ("z", "k"), ("rot", "k"), ("gravity", "k"), ("bounce", "k"), ("spin", "k"),
("mirror", "k"), ("speedMin", "f"), ("speedMax", "f"), ("angleMin", "f"), ("angleMax", "f"))
+# the yes or no box (DialogueTextYN): its question, its toll (geo, 0 none), who hears YES or NO
+op("StartConversationYN", ("text", "x"))
+op("SetToll", ("cost", "i"))
+op("SetYNRequester", ("gameObject", "o"))
+op("SendEventOf") # (custom: to itself, the event a string variable names: the variable, then names and events)
+op("HudSlide", ("out", "n"))
+# the stag menu (src/stag.c): the station chosen to the variable, then CONTINUE; a ride: to nextScene
+op("OpenStagMenu", ("result", "S"))
+op("SetNextScene", ("scene", "s"))
+op("StagTravel")
+op("Translate", ("gameObject", "o"), ("x", "f"), ("y", "f"), ("perSecond", "n"), ("everyFrame", "n"))
+op("HeroCollision", ("sendEvent", "e")) # (Collision2dEvent with the Knight: him touching its owner's colliders)
+op("PlatformStick", ("on", "n")) # (HeroPlatformStick: the Knight on its owner moves with it)
+op("WaitForHeroInPosition", ("sendEvent", "e"))
+op("SendTrigger2DEvent", ("eventTarget", "t"), ("sendEvent", "e")) # (the Knight in its owner's trigger: to another)
+op("FreezeMoment", ("type", "n")) # (GameManager.FreezeMoment)
# HeroController's methods the scripts call (HeroCall's method)
HERO_METHODS = ["RelinquishControl", "RegainControl", "StopAnimationControl", "StartAnimationControl", "FaceLeft",
@@ -378,7 +409,7 @@ class Room:
def external_vars(self):
"""the variables FSMs set in other FSMs (SetFsmBool, PersistentBoolItem's Activated)"""
if not hasattr(self, "_ext"):
- self._ext = {"Activated"}
+ self._ext = {"Activated", "Selection Result"} # (and the stag menu's: src/stag.c)
for o in list(self.by_id.values()):
for c in o["c"]:
for st in (c.get("fsm") or {}).get("states", []):
@@ -810,8 +841,36 @@ class Compiler:
"VibrationPlayerStop", "TransitionToAudioSnapshot", "SetAudioPitch", "SetAudioVolume",
"AudioPlayInState", "FadeAudio", "PlayRandomSound", "SetRotation", "RandomFloat",
"GetLastEvent", "SetBoxCollider2DSize", "Tk2dSpriteSetColor", "SetTextMeshProColor",
- "AudioPlayRandom", "SetName", "GameObjectIsNull"):
+ "AudioPlayRandom", "SetName", "GameObjectIsNull", "PlayVibrationV2"):
+ return None
+ if n == "SendEventByNameV2":
+ n = "SendEventByName"
+ if n == "ReceivedDamage":
+ # (a nail's hit on its collider)
+ return self.emit("Trigger2dEvent", {"trigger": 0, "sendEvent": P.get("sendEvent"), "tag": TRIGGER_TAGS["Nail Attack"]})
+ if n in ("GetFsmInt", "GetFsmFloat") and P.get("gameObject") == "$Damager":
+ # (the hit's damage, more than none; its direction: either way rings the same)
+ if n == "GetFsmInt":
+ return self.emit("SetIntValue", {"intVariable": P.get("storeValue"), "intValue": 1, "everyFrame": 0})
+ return self.emit("SetFloatValue", {"floatVariable": P.get("storeValue"), "floatValue": 0.0, "everyFrame": 0})
+ if n == "GetLanguageString" and P.get("sheetName") == "Prices":
+ # (a price: kept for ConvertStringToInt)
+ import text
+ keys = self.string_values(P.get("convName"))
+ assert len(keys) == 1 and keys[0] in text.sheets()["Prices"], keys
+ self.prices[P.get("storeValue")] = int(text.sheets()["Prices"][keys[0]])
return None
+ if n == "ConvertStringToInt" and P.get("stringVariable") in self.prices:
+ return self.emit("SetIntValue", {"intVariable": P.get("intVariable"), "intValue": self.prices[P.get("stringVariable")],
+ "everyFrame": 0})
+ if n == "WaitForBossLoad":
+ return self.emit("NextFrameEvent", {"sendEvent": P.get("sendEvent")})
+ if n == "SetPlayerDataString" and P.get("stringName") == "nextScene":
+ return self.emit("SetNextScene", {"scene": P.get("value")})
+ if n == "LoadLevel" and P.get("levelName") == "Cinematic_Stag_travel":
+ return self.emit("StagTravel", {})
+ if n == "SetFsmGameObject" and P.get("gameObject") == "$MenuHolder":
+ return None # (the stag menu's requester: OpenStagMenu's)
if n in ("PlayerDataBoolTest",):
return self.emit(n, P)
if n == "CreateUIMsgGetItem":
@@ -871,6 +930,11 @@ class Compiler:
return self.emit("TextAlign", {"centre": 1 if P.get("topCentre") else 0})
if n == "SetFsmFloat":
return self.emit(n, dict(P, slot=self.fsm_slot(P.get("fsmName"), P.get("variableName"))))
+ if P.get("gameObject") == "$DialogueTextYN" and P.get("fsmName") == "Dialogue Page Control":
+ if n == "SetFsmInt" and P.get("variableName") == "Toll Cost":
+ return self.emit("SetToll", {"cost": P.get("setValue")})
+ if n == "SetFsmGameObject" and P.get("variableName") == "Requester":
+ return self.emit("SetYNRequester", {"gameObject": P.get("setValue")})
if n == "SetFsmInt" and P.get("fsmName") == "Charm Msg" and P.get("variableName") == "ID":
return self.emit("CharmNotice", {"id": P.get("setValue")})
if n == "SetSpriteRendererSprite" and P.get("gameObject") == "$Msg Icon":
@@ -1005,6 +1069,9 @@ class Compiler:
# (none the game has: it ends as it starts)
self.problem("conversation %s %s" % (keys, sheets))
return self.emit("SendEvent", {"eventTarget": "Self", "sendEvent": ["event", "CONVO_FINISH"], "delay": 0})
+ if P.get("gameObject") == "$DialogueTextYN":
+ assert len(keys) == 1 and len(sheets) == 1, (keys, sheets)
+ return self.emit("StartConversationYN", {"text": self.rm.texts.id(sheets[0], keys[0])})
if len(keys) == 1 and len(sheets) == 1:
return self.emit("StartConversation", {"text": self.rm.texts.id(sheets[0], keys[0])})
# (by what its variables hold: each conversation they can name)
@@ -1013,8 +1080,11 @@ class Compiler:
body += struct.pack("<HHH", STR.id(k), STR.id(sh), self.rm.texts.id(sh, k))
assert len(body) < 256, rows
return bytes([OPS["StartConversationOf"][0], len(body)]) + body
- if beh == "GameManager" and m in ("CheckCharmAchievements", "AwardAchievement"):
+ if beh == "GameManager" and m in ("CheckCharmAchievements", "AwardAchievement", "CheckStagStationAchievements",
+ "SaveLevelState"):
return None
+ if beh == "HeroPlatformStick" and m in ("Activate", "Deactivate"):
+ return self.emit("PlatformStick", {"on": 1 if m == "Activate" else 0})
if beh == "HeroController" and m in HERO_METHODS:
a0 = args[0]["f"] if args and args[0].get("type") in (5, 0) else 0
if m == "GetState":
@@ -1028,6 +1098,10 @@ class Compiler:
v = (P.get("functionCall") or {}).get("value")
return self.emit("HeroCall", {"method": HERO_METHODS.index(fn), "store": None,
"a": float(v) if isinstance(v, (int, float)) and not isinstance(v, bool) else 0})
+ if fn == "FreezeMoment":
+ return self.emit("FreezeMoment", {"type": int((P.get("functionCall") or {}).get("value") or 0)})
+ if fn and fn.startswith("StoryRecord_"):
+ return None
if fn in ("advanceTypewriter", "TimePasses", "StoryRecord_acquired", "StoryRecord_visited", "SetActionString",
"RefreshButtonIcon", "StopBounce", "CheckGrubAchievements", "AddToGrubList", "CountCharms",
"TriggerStartVideo"):
@@ -1045,7 +1119,16 @@ class Compiler:
return None
if go == "$AudioManager":
return None # (music)
- if go in ("$DialogueManager",) and evn in ("BOX UP", "BOX DOWN"):
+ if go == "$HUD Canvas" and evn in ("IN", "OUT"):
+ return self.emit("HudSlide", {"out": 1 if evn == "OUT" else 0})
+ if go == "$MenuHolder" and evn == "OPEN STAG MENU":
+ return self.emit("OpenStagMenu", {"result": "$Selection Result"})
+ if isinstance(ev, str) and ev.startswith("$") and (t == "Self" or t is None) and ev[1:] in self.rm.external_vars():
+ # (an event a string set from outside names: those the state goes on by)
+ rows = [(STR.id(e), EVENTS.id(e)) for e, _ in self.cur_state["transitions"] if e]
+ body = struct.pack("<HB", self.value(ev, "s"), len(rows)) + b"".join(struct.pack("<HB", s, e) for s, e in rows)
+ return bytes([OPS["SendEventOf"][0], len(body)]) + body
+ if go in ("$DialogueManager",) and evn in ("BOX UP", "BOX DOWN", "BOX UP YN", "BOX DOWN YN"):
return self.emit("SendEventByName", P)
if self.prompt and go == self.prompt[1] and evn in ("UP", "DOWN"):
# (a prompt marker it spawned: shown at its spawn point with its label, or hidden)
@@ -1066,6 +1149,11 @@ class Compiler:
if P.get("gameObject") == "$Main Camera Obj" or P.get("gameObject") == "$MainCamera":
vec = P.get("vector") or [0, 0, 0]
return self.emit("CameraZoom", {"z": vec[2], "time": P.get("time"), "delay": P.get("delay") or 0})
+ # (a bob: a move by a hair and back, the second after the first; under a pixel here)
+ pair = [a for a in self.cur_state["actions"] if a["name"] == "iTweenMoveBy" and
+ dict(a["params"]).get("gameObject") == P.get("gameObject")]
+ if len(pair) == 2 and all(max(abs(c) for c in dict(a["params"])["vector"]) < 0.1 for a in pair):
+ return None
if P.get("speed") is not None or (P.get("loopType") or 0) > 2 or P.get("space") or P.get("delay") or \
(P.get("easeType") or 0) > 21:
self.problem("iTweenMoveBy %r" % P)
@@ -1080,7 +1168,22 @@ class Compiler:
return self.emit(n, {"trigger": P.get("trigger"), "sendEvent": P.get("sendEvent"),
"tag": TRIGGER_TAGS[P.get("collideTag")]})
if n in ("Collision2dEvent", "Collision2dEventLayer"):
+ if P.get("collideTag") == "Player":
+ return self.emit("HeroCollision", P)
return self.emit("Collision2dEvent", P)
+ if n == "WaitForHeroInPosition":
+ return self.emit(n, P)
+ if n == "SendTrigger2DEvent":
+ if P.get("collideTag") not in (None, "", "Player") or P.get("collideLayer") or P.get("trigger") != 0:
+ self.problem("SendTrigger2DEvent %r" % P)
+ return None
+ return self.emit(n, P)
+ if n == "Translate":
+ if P.get("vector") is not None or P.get("x") is not None or P.get("z") is not None or P.get("lateUpdate") \
+ or P.get("fixedUpdate"):
+ self.problem("Translate %r" % P)
+ return None
+ return self.emit(n, dict(P, perSecond=1 if P.get("perSecond") else 0))
if n in ("ListenForUp", "ListenForDown", "ListenForLeft", "ListenForRight", "ListenForAttack", "ListenForJump",
"ListenForCast", "ListenForInventory"):
if P.get("eventTarget") not in (None, "Self"):
@@ -1144,8 +1247,10 @@ class Compiler:
f = self.f
states = []
live = reachable(f, self.rm.external_vars())
+ self.prices = {}
for s in f["states"]:
self.where = s["name"]
+ self.cur_state = s
acts = []
cut = len(s["actions"])
if s["name"] in live:
@@ -1215,6 +1320,8 @@ def prepare(rooms, sprites, texts):
continue
d = unity.scene(name)
rm = Room(name, d, sprites, texts, None)
+ # (events: the game's own (VMEV_*), then each room's own, numbered afresh)
+ EVENTS.truncate(FIXED_EVENTS)
for p in prefixes:
if p in rm.by_path:
rm.add_tree(rm.by_path[p])
@@ -1226,7 +1333,8 @@ def prepare(rooms, sprites, texts):
done += 1
for c in o["c"] + _behaviours(rm, o):
f = c.get("fsm")
- if not f or f["name"] in SKIP_FSMS:
+ # (a door's own scripts: the game's gates are its doors here)
+ if not f or f["name"] in SKIP_FSMS or any(c2.get("class") == "TransitionPoint" for c2 in o["c"]):
continue
cp = Compiler(rm, o, f)
body, init = cp.compile()
@@ -1245,6 +1353,7 @@ def prepare(rooms, sprites, texts):
rm.persist_objs.append((len(rm.fsms) - 1, rm.obj_index[o["id"]]))
for p in rm.problems:
print("vm:", p)
+ assert len(EVENTS.list) < 255, (name, len(EVENTS.list))
nvars = sum(len(i) for _, _, i, _ in rm.fsms)
assert len(rm.objs) <= MAX_OBJS and len(rm.fsms) <= MAX_FSMS and nvars <= MAX_VARS, \
(name, len(rm.objs), len(rm.fsms), nvars)
@@ -1325,7 +1434,8 @@ def room_blob(name, clip_index, sprites, owners=(), persist=None):
fl = (OF_ACTIVE if o.get("self_active", o["active"]) else 0)
box = None
# (one its scripts hear the nail hit: its collider, a trigger or not, is what the nail's trigger meets)
- nail = any(a["name"] == "Trigger2dEvent" and dict(a["params"]).get("collideTag") == "Nail Attack"
+ nail = any((a["name"] == "Trigger2dEvent" and dict(a["params"]).get("collideTag") == "Nail Attack") or
+ a["name"] == "ReceivedDamage"
for c in o["c"] if c.get("fsm") for s in c["fsm"]["states"] for a in s["actions"])
for c in o["c"]:
if c["type"] in ("BoxCollider2D", "CircleCollider2D", "PolygonCollider2D") and c.get("v"):