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: levers, toll gates, breakable walls, soul totems

Mason Chen782c3e728582
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.bin
index 9fa46be6..c9b1aba0 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 78411b80..d21f247d 100644
--- a/games/hollowknight/src/data.h
+++ b/games/hollowknight/src/data.h
@@ -525,128 +525,138 @@
#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 CLIP_BGATE_GATE_IDLE 468
+#define CLIP_BGATE_GATE_OPEN 469
+#define CLIP_BGATE_GATE_OPENED 470
+#define CLIP_BGATE_PILLAR_IDLE 471
+#define CLIP_BGATE_PILLAR_OPENED 472
+#define CLIP_BGATE_SWITCH_ACTIVATED 473
+#define CLIP_BGATE_SWITCH_HIT 474
+#define CLIP_BGATE_SWITCH_IDLE 475
+#define CLIP_BGATE_TOLL_GATE_IDLE 476
+#define CLIP_BGATE_TOLL_GATE_OPEN 477
+#define CLIP_COCOON_COCOON_IDLE 478
+#define CLIP_COCOON_COCOON_SWEAT 479
+#define CLIP_COCOON_SCUTTLER_LAND 480
+#define CLIP_COCOON_SCUTTLER_RUN 481
+#define CLIP_FX_SPLAT 482
+#define CLIP_FX_SPLAT2 483
+#define CLIP_FIREBALL_BLAST 484
+#define CLIP_FIREBALL_BALL 485
+#define CLIP_FIREBALL_BALL_END 486
+#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 487
+#define CLIP_DRIP_IDLE 488
+#define CLIP_DRIP_DRIP 489
+#define CLIP_DRIP_FALL 490
+#define CLIP_DRIP_IMPACT 491
+#define CLIP_HORNETCS_EVADE 492
+#define CLIP_HORNETCS_EVADE_ANTIC 493
+#define CLIP_HORNETCS_FALL 494
+#define CLIP_HORNETCS_HARPOON_SIDE 495
+#define CLIP_HORNETCS_IDLE 496
+#define CLIP_HORNETCS_JUMP_FULL 497
+#define CLIP_HORNETCS_POINT 498
+#define CLIP_HORNETCS_RUN 499
+#define CLIP_HORNETCS_SOFT_LAND 500
+#define CLIP_HORNETCS_THREAD_1 501
+#define CLIP_HORNETCS_THROW_SIDE 502
+#define CLIP_HORNETCS_THROW_SIDE_START 503
+#define CLIP_HORNETCS_TURN 504
+#define CLIP_HORNETCS_TURNTOIDLE 505
+#define CLIP_BULLET_IDLE 506
+#define CLIP_BULLET_IMPACT 507
+#define CLIP_BULLET_SHOCKWAVE_SPURT 508
+#define CLIP_PROP0_WATERFALL_LOOP 509
+#define CLIP_PROP1_TORCH2 510
+#define CLIP_PROP1_TORCH3 511
+#define CLIP_VM0_FLOWER 512
+#define CLIP_VM0_IDLE 513
+#define CLIP_VM0_REACH 514
+#define CLIP_VM0_REACH_TO_IDLE 515
+#define CLIP_VM0_TALK_LEFT 516
+#define CLIP_VM0_TALK_RIGHT 517
+#define CLIP_VM0_TURN_LEFT 518
+#define CLIP_VM0_TURN_RIGHT 519
+#define CLIP_VM2_IDLE 520
+#define CLIP_VM2_LOOKLEFT 521
+#define CLIP_VM2_LOOKRIGHT 522
+#define CLIP_VM3_IDLE 523
+#define CLIP_VM3_TALK 524
+#define CLIP_VM3_TALK_END 525
+#define CLIP_VM4_IDLE 526
+#define CLIP_VM4_LOOKLEFT 527
+#define CLIP_VM4_LOOKRIGHT 528
+#define CLIP_VM4_SIT 529
+#define CLIP_VM4_SIT_TALK 530
+#define CLIP_VM4_SIT_TALK_END 531
+#define CLIP_VM5_ARRIVE 532
+#define CLIP_VM5_ARRIVE_SMOKE 533
+#define CLIP_VM5_IDLE 534
+#define CLIP_VM6_BELL_IDLE 535
+#define CLIP_VM6_BELL_RING_R 536
+#define CLIP_VM6_BELL_STAND 537
+#define CLIP_VM6_BELL_STAND_APPEAR 538
+#define CLIP_VM6_BOX_DISAPPEAR 539
+#define CLIP_VM6_BOX_DISAPPEAR_QUICK 540
+#define CLIP_VM6_BOX_IDLE 541
+#define CLIP_VM6_FRONT 542
+#define CLIP_VM6_GRATE_DISAPPEAR 543
+#define CLIP_VM6_GRATE_IDLE 544
+#define CLIP_VM8_DAZED 545
+#define CLIP_VM8_IDLE 546
+#define CLIP_VM8_TURN_L 547
+#define CLIP_VM8_TURN_R 548
+#define CLIP_VM8_WAKE 549
+#define CLIP_VM11_HEGEMOL_CAST 550
+#define CLIP_VM11_HEGEMOL_IDLE 551
+#define CLIP_VM11_LURIEN_CAST 552
+#define CLIP_VM11_LURIEN_IDLE 553
+#define CLIP_VM11_MONOMON_CAST 554
+#define CLIP_VM11_MONOMON_IDLE 555
+#define CLIP_VM12_IDLE 556
+#define CLIP_VM12_SIT_IDLE 557
+#define CLIP_VM12_SIT_TALK 558
+#define CLIP_VM12_SIT_TALK_END 559
+#define CLIP_VM12_SUMMON 560
+#define CLIP_VM12_TALK 561
+#define CLIP_VM12_TALK_END 562
+#define CLIP_VM12_TURN 563
+#define CLIP_VM14_IDLE 564
+#define CLIP_VM14_LOOK_LEFT 565
+#define CLIP_VM14_LOOK_RIGHT 566
+#define CLIP_VM14_TALK_CONVO_END 567
+#define CLIP_VM14_TALK_CONVO_START 568
+#define CLIP_VM14_TALK_SHOP_END 569
+#define CLIP_VM14_TALK_SHOP_START 570
+#define CLIP_VM15_IDLE 571
+#define CLIP_VM15_SHOP_END 572
+#define CLIP_VM15_SHOP_START 573
+#define CLIP_VM15_TALK_END 574
+#define CLIP_VM15_TALK_START 575
+#define CLIP_VM16_CRY 576
+#define CLIP_VM16_CRY_TURN 577
+#define CLIP_VM16_FREED 578
+#define CLIP_VM16_HOME_BOUNCE 579
+#define CLIP_VM16_HOME_WAVE 580
+#define CLIP_VM16_IDLE 581
+#define CLIP_VM17_CRUMBLE 582
+#define CLIP_VM17_IDLE 583
+#define CLIP_VM18_BECKON 584
+#define CLIP_VM18_CHEER 585
+#define CLIP_VM18_CRY 586
+#define CLIP_VM18_GIFT 587
+#define CLIP_VM18_IDLE 588
+#define CLIP_ANIM0_STAG_DOOR_OPEN00 589
+#define CLIP_ANIM1_DASH_CLOAK_CORPSE000 590
+#define CLIP_ANIM2_GROUND_PLINK_0 591
+#define CLIP_ANIM3_FIREBALL_COLLECT_ANIM 592
+#define SPRITE_HERO_LIGHT 2858
+#define SPRITE_DIALOGUE_BACKBOARD 2859
+#define SPRITE_PROMPT_SHADOW 2860
+#define SPRITE_CORPSE_NAIL 2861
+#define SPRITE_FK_BARREL 2862
+#define SPRITE_FK_STAFF 2863
+#define SPRITE_DIGIT0 3244
#define STYLE_DIALOGUE 0
#define STYLE_PROMPT 1
#define STYLE_TITLE_L 2
@@ -695,20 +705,20 @@
#define EK_HORNET 29
#define NUM_KINDS 30
#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 TXT_PROMPT_LISTEN 90
+#define TXT_PROMPT_REST 91
+#define TXT_PROMPT_INSPECT 92
+#define TXT_PROMPT_ENTER 93
+#define TXT_PROMPT_SIT 94
+#define TXT_PROMPT_SHOP 95
+#define TXT_PROMPT_TRAVEL 96
+#define TXT_PROMPT_ASCEND 97
+#define TXT_PROMPT_DESCEND 98
+#define TXT_PROMPT_EXIT 99
+#define TXT_PROMPT_ACCEPT 100
+#define TXT_PROMPT_TRADE 101
+#define TXT_PROMPT_WATCH 102
+#define TXT_PROMPT_CHALLENGE 103
#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
@@ -830,6 +840,11 @@
#define VMOP_WAITFORHEROINPOSITION 117
#define VMOP_SENDTRIGGER2DEVENT 118
#define VMOP_FREEZEMOMENT 119
+#define VMOP_DAMAGERINFO 120
+#define VMOP_INTOPERATOR 121
+#define VMOP_GETDISTANCE 122
+#define VMOP_SOULORBS 123
+#define VMOP_FADETO 124
#define VMEV_FINISHED 0
#define VMEV_CONVO_FINISH 1
#define VMEV_CONVO_START 2
@@ -869,18 +884,19 @@
#define VMEV_YES 36
#define VMEV_NO 37
#define VMEV_CONTINUE 38
+#define VMEV_RESET 39
#define VMSTR_NPC_TITLE 14
-#define VMSTR_VISITED 443
-#define VMSTR_DISPLAY_RIGHT 444
-#define VMSTR_HORNET_SAVER 193
-#define VMSTR_ITEM 387
-#define STR_ATTACK_RANGE 22
+#define VMSTR_VISITED 526
+#define VMSTR_DISPLAY_RIGHT 527
+#define VMSTR_HORNET_SAVER 196
+#define VMSTR_ITEM 438
+#define STR_ATTACK_RANGE 23
#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 STR_DOOR_STAGEXIT 21
#define TITLE_KINGSPASS 0
#define TITLE_DIRTMOUTH 1
#define TITLE_CROSSROADS 2
@@ -902,67 +918,69 @@
#define TITLE_TISO_NC 18
#define TITLE_CHARM_SLUG 19
#define NUM_TITLES 20
-#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 TITLE_TABLE {{104, 105, -1, -1}, {106, 107, 108, -1}, {109, 110, -1, 111}, {112, 113, -1, 114}, {115, 116, -1, 117}, {118, 119, -1, -1}, {120, 121, 122, -1}, {123, 124, -1, -1}, {125, 126, -1, -1}, {127, 128, -1, -1}, {129, 130, -1, -1}, {131, 132, -1, -1}, {133, 134, -1, -1}, {135, 136, -1, -1}, {137, 138, -1, 139}, {140, 141, -1, 142}, {140, 141, -1, 143}, {144, 145, 146, -1}, {144, 145, -1, -1}, {147, 148, -1, 149}}
+#define SPRITE_FLEUR_TOP 2864
#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 2837
+#define SPRITE_FLEUR_BOT 2865
#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 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 SPRITE_MSG_BG 2866
+#define SPRITE_MSG_STOP 2867
+#define SPRITE_MSG_FLEUR 2868
+#define SPRITE_MSG_KEY 2869
+#define SPRITE_MSG_ICON_FIREBALL 2870
+#define SPRITE_MSG_ICON_DASH 2871
+#define SPRITE_GRASS_BALL 2872
+#define SPRITE_SOUL_ORB 2873
+#define SOUL_ORB_SORT {13, 0}
+#define MSG_TABLE {{150, 151, 152, 153, 154, 155}, {156, 157, 158, 159, 160, 161}}
+#define NOTICE_BACKBOARD {2874, 1.0000f, 0.6931f}
+#define TUTE_FLEUR {2868, 1.0000f, 1.0000f}
+#define TUTE_BACKBOARD {2875, 1.0000f, 0.9560f}
+#define TUTE_IMAGE {2876, 1.0000f, 1.0000f}
+#define TUTE_STOP {2867, 1.0000f, 1.0000f}
+#define NOTICE_ICONS {2877, 2878, 2879}
#define CHARM_ICON_K 1.5000f
-#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 CHARM_ICONS {-1, 2880, 2881, 2882, 2883, -1, 2884, 2885, 2886, -1, -1, -1, -1, -1, 2887, -1, -1, -1, 2888, 2889, 2890, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CHARM_NAMES {-1, 162, 163, 164, 165, -1, 166, 167, 168, -1, -1, -1, -1, -1, 169, -1, -1, -1, 170, 171, 172, -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 173
+#define TXT_CHARM_TUTE_SUB 174
+#define TXT_CHARM_REMINDER 175
+#define TXT_YN_YES 176
+#define TXT_YN_NO 177
+#define TXT_YN_NOT_ENOUGH 178
+#define MENU_LOGO {2891, 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 {2863, 0.0000f, 0.0000f, 1.0023f, 1.0000f}
+#define MENU_POINTER {2892, 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 {2864, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
+#define MENU_PROFILES_FLEUR {2893, 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, {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_ZONES {{2, {2894, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2895, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2896, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2897, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2898, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
#define MENU_SLOT_NZONES 5
#define MENU_SLOT_BG_DY 0.0102f
-#define MENU_SLOT_FLEUR {2870, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_FLEUR {2899, 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 {2871, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_SELECTOR {2900, 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 {2872, 0.0000f, 0.0000f, 1.0000f, 1.0025f}
+#define MENU_SLOT_CURSOR {2901, 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 {2873, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_ORB {2902, 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 {2874, 0.0000f, 0.0000f, 1.0039f, 1.0000f}
+#define MENU_SLOT_GEO {2903, 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 {2875, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_HEALTH {2904, 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
@@ -980,60 +998,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 {2876, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_TOP {2905, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_PAUSE_TOP_Y 2.3653f
-#define MENU_PAUSE_BOT {2877, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_BOT {2906, 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 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 TXT_MAIN_START 179
+#define TXT_MAIN_QUIT 180
+#define TXT_PROFILE_NEW_GAME 181
+#define TXT_PROFILE_CLEAR_BUTTON 182
+#define TXT_PROFILE_CLEAR_PROMPT 183
+#define TXT_NAV_YES 184
+#define TXT_NAV_NO 185
+#define TXT_NAV_BACK 186
+#define TXT_PAUSE_CONTINUE 187
+#define TXT_PAUSE_MAIN 188
+#define TXT_PROFILE_CORRUPTED 189
+#define TXT_SCREEN_SAVE_PROFILES 190
+#define TXT_ZONES {191, 192, 193, 194, 195}
#define INV_X -4.0500f
#define INV_Y 7.5500f
-#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_BORDER {{2907, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2907, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2908, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2909, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2910, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2911, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
#define INV_NBORDER 6
-#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_FRAME {2912, 4.0479f, -7.1963f, 1.0f, 1.0f}
+#define INV_ARROW_L {2913, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
+#define INV_ARROW_R {2913, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_L {2914, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_R {2914, 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 {195, 196, 197, 198}
-#define CH_BB {2886, -7.9200f, -8.3700f, 1.0000f, 1.0000f}
+#define TXT_INV_PANES {198, 199, 200, 201}
+#define CH_BB {2915, -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 {2887, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
+#define CH_GLOW {2916, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
#define CH_GLOW_A 0.6970f
-#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_ICONS {-1, 2880, 2881, 2882, 2883, -1, 2884, 2885, 2886, -1, -1, -1, -1, -1, 2887, -1, -1, -1, 2888, 2889, 2890, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CH_NEXT_DOT {2917, 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 {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_FULL {2918, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_EMPTY {2919, 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 {2891, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
+#define CH_DIVIDER {2920, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}
-#define CH_COST_PIP {2889, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_COST_PIP {2918, 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
@@ -1042,59 +1060,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 {2892, 16.3208f, -13.2878f, 1.0f, 1.0f}
+#define CH_CONFIRM_KEY {2921, 16.3208f, -13.2878f, 1.0f, 1.0f}
#define CH_CONFIRM_KEY_W 0.6412f
-#define CH_CURSOR {2893, 0.0000f, 0.0000f, 1.0000f, 0.9756f}
+#define CH_CURSOR {2922, 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 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 TXT_CHARM_TXT_EQUIPPED 202
+#define TXT_CHARM_TXT_OVERCHARMED 203
+#define TXT_CHARM_TXT_COST 204
+#define TXT_CTRL_EQUIP 205
+#define TXT_CTRL_UNEQUIP 206
+#define TXT_CHARM_ALERT_NONE 207
+#define TXT_CHARM_ALERT_NONE_BENCH 208
+#define TXT_CHARM_NOTCHES 209
+#define TXT_CHARM_NAMES_INV {-1, 210, 211, 212, 213, -1, 214, 215, 216, -1, -1, -1, -1, -1, 217, -1, -1, -1, 218, 219, 220, -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, 221, 222, 223, 224, -1, 225, 226, 227, -1, -1, -1, -1, -1, 228, -1, -1, -1, 229, 230, 231, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define TXT_KEY_OK 232
+#define INV_FIXED {{2923, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2924, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2925, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2926, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2927, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2928, -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}, {2929, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2930, -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 {{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_HEART_PIECES {{2931, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2932, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2933, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2934, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
+#define INV_VESSEL_PIECES {{2935, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2936, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2937, -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 {{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 {{2938, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2939, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2940, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2941, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2942, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2943, 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 {{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_TRINKETS {{2944, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2945, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2946, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2947, 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 {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_TRINKET_BB {2948, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
+#define INV_DIVIDERS {{2949, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2949, 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 {{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 TXT_INV_HEART {{233, 234}, {235, 236}, {237, 238}, {235, 239}, {235, 240}, {241, 242}}
+#define TXT_INV_VESSEL {{233, 234}, {243, 244}, {245, 246}, {243, 247}, {248, 249}}
+#define TXT_INV_FIXED {{250, 251}, {252, 253}, {254, 255}, {256, 257}}
+#define TXT_INV_EQ {{258, 259}, {260, 261}, {262, 263}, {264, 265}, {266, 267}, {268, 269}}
+#define TXT_INV_QUILL {270, 271, 272, 273}
+#define TXT_INV_TRINKETS {{274, 275}, {276, 277}, {278, 279}, {280, 281}}
+#define SHOP_BACKBOARD {2950, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
+#define SHOP_MASK_TOP {2951, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
+#define SHOP_MASK_BOTTOM {2952, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
+#define SHOP_ARROW_U {2953, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
+#define SHOP_ARROW_D {2953, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
+#define SHOP_SELECTOR {2954, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
+#define SHOP_CONFIRM_GEO {2955, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_L {2956, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_R {2956, 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 280
+#define TXT_KEY_BACK 283
#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}}
@@ -1111,7 +1129,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 {2928, 5.5100f, 2.5800f, 1.0000f, 1.0000f}
+#define SHOP_PEG {2957, 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}
@@ -1122,24 +1140,24 @@
#define SHOP_ROW_TOP 4.9000f
#define SHOP_ROW_BOTTOM -5.2500f
#define SHOP_ARROW_BOB 0.1500f
-#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 TXT_SHOP_CTRL_BUY 286
+#define TXT_SHOP_CTRL_EXIT 287
+#define TXT_SHOP_CTRL_CONFIRM 288
+#define TXT_SHOP_CTRL_CANCEL 289
+#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 290
+#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 291
+#define TXT_SHOP_CHARM_TXT_NOTCHCOST 292
+#define TXT_SHOP_YES 293
+#define TXT_SHOP_NO 294
#define SHOP_DESC_BOTTOM -5.0500f
-#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_ITEMS {{2959, 0.5714f, 295, 296, 150, 1, 125, -1, 0, 0}, {2959, 0.5714f, 295, 297, 500, 1, 126, 125, 0, 0}, {2960, 0.5714f, 298, 299, 550, 3, 127, -1, 0, 0}, {2961, 0.5714f, 300, 301, 950, 10, 128, -1, 0, 0}, {2962, 0.5714f, 302, 303, 300, 2, 37, -1, 0, 1}, {2963, 0.5714f, 304, 305, 200, 2, 40, -1, 0, 4}, {2964, 0.5714f, 306, 307, 1800, 0, 119, -1, 0, 0}, {2965, 0.5714f, 308, 309, 60, 11, 129, -1, 0, 0}, {2966, 0.5714f, 310, 311, 220, 2, 38, -1, 0, 2}, {2967, 0.5714f, 312, 313, 120, 0, 2, -1, 0, 0}, {2968, 0.5714f, 314, 315, 40, 9, 130, 10, 0, 0}, {2968, 0.5714f, 316, 317, 80, 9, 131, 28, 0, 0}, {2969, 0.5714f, 318, 319, 100, 16, 133, -1, 0, 0}, {2970, 0.5714f, 320, 321, 100, 16, 134, -1, 0, 0}, {2971, 0.5714f, 322, 323, 100, 16, 135, -1, 0, 0}, {2972, 0.5714f, 324, 325, 100, 16, 137, 147, 0, 0}, {2973, 0.5714f, 326, 327, 100, 16, 136, -1, 0, 0}, {2974, 0.5714f, 328, 329, 100, 17, 139, -1, 0, 0}, {2975, 0.5714f, 330, 331, 100, 17, 140, -1, 0, 0}, {2976, 0.5714f, 332, 333, 100, 17, 141, 14, 0, 0}, {2977, 0.5714f, 334, 335, 210, 17, 142, 14, 0, 0}, {2978, 0.5714f, 336, 337, 250, 2, 44, -1, 0, 8}, {2979, 0.5714f, 338, 339, 300, 2, 54, -1, 0, 18}, {2980, 0.5714f, 340, 341, 120, 2, 50, -1, 0, 14}, {2981, 0.5714f, 342, 343, 220, 2, 55, -1, 0, 19}, {2982, 0.5714f, 344, 345, 800, 2, 43, -1, 0, 7}, {2983, 0.5714f, 346, 347, 120, 8, 143, -1, 5, 0}, {2983, 0.5714f, 346, 347, 500, 8, 144, -1, 10, 0}, {2983, 0.5714f, 346, 347, 900, 8, 145, -1, 18, 0}, {2983, 0.5714f, 346, 348, 1400, 8, 146, -1, 25, 0}}
#define SHOP_FIRST {0, 8, 21, 30}
-#define SHOP_ROW_GEO {2929, 1.4551f, 0.0000f, 1.0000f, 1.0000f}
+#define SHOP_ROW_GEO {2958, 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 {347, 348, 349}
+#define SHOP_NOSTOCK {350, 351, 352}
#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}
@@ -1149,35 +1167,36 @@
#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 {2984, -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_PIECES {{2985, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2986, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2987, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {2988, 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_MAP_KNIGHT {2989, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define STAG_MAP_SHADOW {2990, 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_POINTER_R {2991, 2.8680f, 0.6180f, -1.0000f, 1.0000f}
+#define STAG_POINTER_L {2991, -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_LIST_KNIGHT {2989, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
+#define STAG_DIVIDER {2992, -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 TXT_STAG_STATIONS 353
+#define TXT_STAG_NAMES {354, 314, 316}
#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 TXT_STAG_CTRL_TRAVEL 355
#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 TXT_STAG_CTRL_CANCEL 289
#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
+#define SEMI_PERSIST {250, 251, 252, 258, 259, 260}
diff --git a/games/hollowknight/src/death.c b/games/hollowknight/src/death.c
index 076694d3..9c2b28b8 100644
--- a/games/hollowknight/src/death.c
+++ b/games/hollowknight/src/death.c
@@ -95,6 +95,7 @@ void death_start(float x, float y, bool facing_right) {
bool cracked = !g_pd.soul_limited;
g_pd.soul_limited = true;
set_shade();
+ persist_reset_semi(); /* (PlayerDead: ResetSemiPersistentItems, then the save) */
save_game();
/* (Send Events: HERO LEAVE) */
enemies_hero_leave();
diff --git a/games/hollowknight/src/game.c b/games/hollowknight/src/game.c
index 580efcea..99f3f0b2 100644
--- a/games/hollowknight/src/game.c
+++ b/games/hollowknight/src/game.c
@@ -1,5 +1,9 @@
/* The game: a scene, the Knight in it, the camera; ticks of 1/50 s. */
#include "game.h"
+#ifdef HOST
+#include <stdio.h>
+#include <stdlib.h>
+#endif
PlayerData g_pd;
Game g_game;
@@ -47,9 +51,11 @@ static void room_entered(void) {
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)
+ if (es[i].type == ENT_GATE) {
+ if (es[i].flags & G_ENTRY_ONLY) ent_set_enabled(i, false);
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();
}
@@ -137,7 +143,8 @@ void game_transition(int room, int entry, int gate, float delay, bool without_in
/* TryDoTransition: the Knight through a gate (facing it, not recoiling), or pushed back out of it */
static void gate_touched(const Ent *e) {
Hero *h = &g_hero;
- if ((e->flags & G_DOOR) || g_game.scene_phase != SP_NONE) return;
+ /* (only as the game plays: not while the Knight is still coming in) */
+ if ((e->flags & G_DOOR) || g_game.scene_phase != SP_NONE || h->cs.transitioning) return;
int g = gate_kind(e);
bool back = h->cs.recoiling || (g == GATE_RIGHT && !h->cs.facing_right) || (g == GATE_LEFT && h->cs.facing_right) ||
e->a == 0xFFFF; /* (or to a room this game leaves out) */
@@ -171,6 +178,9 @@ static void scene_load(void) {
return;
}
/* (no such gate: in the middle of the room) */
+#ifdef HOST
+ if (getenv("HKROOM")) printf("no gate %s in %s\n", want, room_name(g_room.id));
+#endif
hero_enter_scene(-1, GATE_DOOR, g_room.h->w / 2, g_room.h->h / 2, 0, 0, 0, g->next_delay);
}
@@ -270,7 +280,7 @@ static void trigger_event(int i, const Ent *e, int kind) {
break;
case ENT_GATE:
if (e->flags & G_DOOR) door_trigger(i, kind);
- else if (kind == EV_ENTER) gate_touched(e);
+ else if (kind != EV_EXIT) gate_touched(e); /* (OnTriggerEnter2D, and OnTriggerStay2D until it has gone) */
break;
case ENT_HAZARD_TRIGGER:
if (kind == EV_ENTER) {
diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.h
index de06f521..470a24e5 100644
--- a/games/hollowknight/src/game.h
+++ b/games/hollowknight/src/game.h
@@ -137,7 +137,8 @@ enum { HB_BOUNCE = 1, HB_RECOIL = 2 }; /* a hit box (ENT_BOX's flags): a down
enum { HAZ_NONE, HAZ_NORMAL, HAZ_SPIKES, HAZ_ACID, HAZ_LAVA, HAZ_PIT }; /* DamageHero.hazardType */
enum { MK_SECRET = 1, MK_REMASK = 2, MK_SIMPLE = 4 }; /* masks: the unmasker, remasker and inverse FSMs */
enum { CL_PREVENT_UP = 1, CL_PREVENT_DOWN = 2, CL_MAX_PRIORITY = 4 };
-enum { G_DOOR = 1, G_ENTER_RIGHT = 2, G_ENTER_LEFT = 4, G_DONT_WALK_OUT = 8, G_NON_HAZARD = 16, G_HARD_LAND = 32 };
+enum { G_DOOR = 1, G_ENTER_RIGHT = 2, G_ENTER_LEFT = 4, G_DONT_WALK_OUT = 8, G_NON_HAZARD = 16, G_HARD_LAND = 32,
+ G_ENTRY_ONLY = 64 }; /* (entry only: its collider off, never left by) */
#define FACING_RIGHT 1
typedef struct {
uint8_t type, flags;
@@ -332,11 +333,14 @@ void titles_tick(void);
void titles_draw(void);
/* the game's own scripts (vm.c): a room's, run each step, their objects drawn; events heard by all of them */
void hero_add_mp_charge(int amount); /* (AddMPCharge) */
+void hero_cancel_hero_jump(void); /* (CancelHeroJump) */
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_send(int obj, int ev);
+void vm_reset_semi(void);
+void persist_reset_semi(void); /* (ResetSemiPersistentItems: at a bench, on death) */ /* (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) */
@@ -346,8 +350,9 @@ 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 vm_spell(float x0, float y0, float x1, float y1, float direction); /* (a spell's box: the triggers it is in) */
+int vm_nail(const float *pts, int npts, float direction); /* (the nail's slash: what it meets; -> HB_*) */
+void soul_orbs_fling(int n, float x, float y, float smin, float smax, float amin, float amax, float vx, float vy);
void piece_spawn(int sprite, int layer, int order, int flags, float x, float y, float z, float rot, float gravity,
float bounce, float spin_factor, float mirror, float vx, float vy, bool resting); /* (obj.c: debris) */
void vm_activate_children(uint16_t name, bool on); /* ActivateAllChildren of a script object, by name */
diff --git a/games/hollowknight/src/hero.c b/games/hollowknight/src/hero.c
index 5d01aa9d..794805e2 100644
--- a/games/hollowknight/src/hero.c
+++ b/games/hollowknight/src/hero.c
@@ -1439,6 +1439,12 @@ void hero_soul_gain(void) {
}
void hero_add_mp_charge(int amount) { add_mp_charge(amount); }
+void hero_cancel_hero_jump(void) {
+ if (!g_hero.cs.jumping) return;
+ cancel_jump();
+ if (g_hero.body.vy > 0) g_hero.body.vy = 0;
+}
+
void hero_add_geo(int amount) { g_pd.geo += amount; }
void hero_add_health(int amount) {
diff --git a/games/hollowknight/src/npc.c b/games/hollowknight/src/npc.c
index 96d2ee23..71ae50a3 100644
--- a/games/hollowknight/src/npc.c
+++ b/games/hollowknight/src/npc.c
@@ -76,6 +76,7 @@ static void rest_burst(Bench *b, const Ent *e) {
hero_max_health();
b->sleeping = false, b->get_off_wake = false;
save_set_respawn(str_at(e->s0), b->face_right = g_hero.cs.facing_right);
+ persist_reset_semi();
b->state = BS_PAUSE, b->t = 0;
}
diff --git a/games/hollowknight/src/obj.c b/games/hollowknight/src/obj.c
index 4e778dec..24844fed 100644
--- a/games/hollowknight/src/obj.c
+++ b/games/hollowknight/src/obj.c
@@ -44,9 +44,9 @@ typedef struct {
int16_t sprite;
uint8_t layer, steps;
uint16_t order;
- bool on, resting, spin;
- float x, y, z, vx, vy, ang, w; /* (w: degrees a second) */
- float gravity, bounce, spin_factor, mirror, speed;
+ bool on, resting, spin, orb;
+ float x, y, z, vx, vy, ang, w; /* (w: degrees a second; an orb's acceleration) */
+ float gravity, bounce, spin_factor, mirror, speed; /* (an orb's: its scale, spin_factor) */
} Piece;
static Piece pieces[MAX_PIECES];
@@ -58,7 +58,7 @@ void piece_spawn(int sprite, int layer, int order, int flags, float x, float y,
for (int i = 0; i < MAX_PIECES && !q; i++)
if (!pieces[i].on) q = &pieces[i];
if (!q) return; /* (all in use: this one is not seen) */
- q->on = true, q->resting = resting, q->steps = 0;
+ q->on = true, q->resting = resting, q->steps = 0, q->orb = false;
q->sprite = (int16_t)sprite, q->layer = (uint8_t)layer, q->order = (uint16_t)order;
q->x = x, q->y = y, q->z = z;
q->spin = flags & 1;
@@ -76,9 +76,59 @@ static void piece_fling(const Ent *p, float ox, float oy, float angle_offset, fl
p->p1, p->p2, p->p3, cosf(a) * s, sinf(a) * s, false);
}
+/* ---------------------------------------------------------------- soul orbs (SoulOrb: Soul Orb R) */
+/* flung, slowed (its body's linear damping, 2); once slow, it speeds to the Knight (Zoom: faster each frame, at 30 at
+ * most), and near him gives him soul (AddMPCharge 2). With the debris: a piece flagged orb */
+void soul_orbs_fling(int n, float x, float y, float smin, float smax, float amin, float amax, float vx, float vy) {
+ static const int16_t sort[2] = SOUL_ORB_SORT;
+ for (int k = 0; k < n; k++) {
+ Piece *q = NULL;
+ for (int i = 0; i < MAX_PIECES && !q; i++)
+ if (!pieces[i].on) q = &pieces[i];
+ if (!q) {
+ hero_add_mp_charge(2); /* (no room for it: its soul all the same) */
+ continue;
+ }
+ memset(q, 0, sizeof *q);
+ q->on = q->orb = true;
+ q->sprite = SPRITE_SOUL_ORB, q->layer = (uint8_t)sort[0], q->order = (uint16_t)(sort[1] + 32768);
+ q->x = x + rand_range(-vx, vx), q->y = y + rand_range(-vy, vy), q->z = rand_range(-0.1f, -0.001f);
+ float a = rand_range(amin, amax) * (float)M_PI / 180, sp = rand_range(smin, smax);
+ q->vx = cosf(a) * sp, q->vy = sinf(a) * sp;
+ q->spin_factor = rand_range(0.9f, 1.3f); /* (scaleModifier) */
+ }
+}
+
+static void orb_tick(Piece *q) {
+ const Body *h = &g_hero.body;
+ if (!q->resting) {
+ /* (flung: slowed by its damping; slow enough, its Zoom) */
+ float k = 1 / (1 + DT * 2);
+ q->vx *= k, q->vy *= k;
+ if (q->vx * q->vx + q->vy * q->vy < 2.5f * 2.5f) q->resting = true, q->speed = 0, q->w = 0;
+ } else {
+ /* (Zoom, a frame at a time: 60 a second) */
+ q->speed += q->w * 1.2f;
+ if (q->speed > 30) q->speed = 30;
+ q->w += 0.07f * 1.2f;
+ float dx = h->x - q->x, dy = h->y - q->y, d = sqrtf(dx * dx + dy * dy);
+ if (d < 0.8f) {
+ q->on = false;
+ hero_add_mp_charge(2);
+ return;
+ }
+ q->vx = q->speed * dx / d, q->vy = q->speed * dy / d;
+ }
+ q->x += q->vx * DT, q->y += q->vy * DT;
+}
+
static void pieces_tick(void) {
for (int i = 0; i < MAX_PIECES; i++) {
Piece *q = &pieces[i];
+ if (q->on && q->orb) {
+ orb_tick(q);
+ continue;
+ }
if (!q->on || q->resting) continue;
/* SpinSelf: one push of torque on its second step (a polygon of about a unit: this many degrees a second) */
if (q->spin && q->steps == 1) q->w = q->vx * q->spin_factor * 60;
@@ -113,7 +163,15 @@ static void pieces_draw(void) {
const Piece *q = &pieces[i];
if (!q->on) continue;
Inst in;
- sprite_inst_rot(q->sprite, q->x, q->y, q->z, q->mirror, 1, q->ang, 0, &in);
+ if (q->orb) {
+ /* (FaceAngle, ProjectileSquash: along its way, stretched by its speed) */
+ float v = sqrtf(q->vx * q->vx + q->vy * q->vy), sy = 1 - v * 0.02f, sx = 1 + v * 0.02f;
+ if (sx > 2) sx = 2;
+ if (sy < 0.65f) sy = 0.65f;
+ sprite_inst_rot(q->sprite, q->x, q->y, q->z, sx * q->spin_factor, sy * q->spin_factor,
+ atan2f(q->vy, q->vx) * 57.29578f, 0, &in);
+ } else
+ sprite_inst_rot(q->sprite, q->x, q->y, q->z, q->mirror, 1, q->ang, 0, &in);
gfx_actor(&in, SORT_KEY(q->layer, (int)q->order - 32768));
}
}
@@ -856,7 +914,7 @@ void obj_swing_start(void) {
int obj_nail(const float *pts, int npts, float direction) {
/* (damages_enemy: the nail's damage, at its Multiplier; Fury's 1.75) */
int out = enemies_nail(pts, npts, direction, g_hero.fury ? (int)rintf(g_pd.nail_damage * 1.75f) : g_pd.nail_damage);
- vm_nail(pts, npts);
+ out |= vm_nail(pts, npts, direction);
for (int k = 0; k < nobjs; k++) {
Obj *o = &objs[k];
const Ent *e = ent_at(o->ent);
diff --git a/games/hollowknight/src/spell.c b/games/hollowknight/src/spell.c
index ee8bbab2..2275ba13 100644
--- a/games/hollowknight/src/spell.c
+++ b/games/hollowknight/src/spell.c
@@ -298,7 +298,7 @@ static void fireball_hit_things(Fireball *f) {
int damage = f->sx > 1 ? FB_DAMAGE_SHAMAN : FB_DAMAGE;
f->hit_enemies |= enemies_spell(cx - hx, cy - hy, cx + hx, cy + hy, dir, damage, FB_MAGNITUDE, f->hit_enemies);
obj_spell(cx - hx, cy - hy, cx + hx, cy + hy, dir, f->hit_objs);
- vm_spell(cx - hx, cy - hy, cx + hx, cy + hy);
+ vm_spell(cx - hx, cy - hy, cx + hx, cy + hy, dir);
}
void fireballs_tick(void) {
diff --git a/games/hollowknight/src/vm.c b/games/hollowknight/src/vm.c
index b2f4ec62..2402f283 100644
--- a/games/hollowknight/src/vm.c
+++ b/games/hollowknight/src/vm.c
@@ -50,6 +50,7 @@ typedef struct {
Anim anim;
uint16_t flags;
uint8_t alpha; /* (its material's color's alpha: the scripts') */
+ int8_t fade; /* (iTweenFadeTo: its alpha's change a step, to none or all) */
} Obj;
typedef struct {
int16_t obj; /* (-1: none) */
@@ -99,6 +100,8 @@ static struct {
int title;
uint32_t prev_keys;
uint32_t touch, touch_was; /* (objects whose colliders the Knight touches, this step and the one before) */
+ float nail_dir, spell_dir, dmg_dir; /* (the nail's last blow, the spell's way; the hit's: damages_enemy's direction) */
+ uint8_t dmg_type; /* (its attackType: 0 the nail, 2 a spell) */
} vm;
/* ---------------------------------------------------------------- the data (VMDEF: definitions, string tables) */
@@ -354,9 +357,11 @@ static void anims_start(void) {
/* (the colliders objects have: on as they are) */
static void obj_colliders(void) {
+ /* (on with it, and as SetCollider leaves it) */
for (int i = 0; i < vm.nobjs; i++)
if (vm.rec[i].ncol && !(vm.objs[i].flags & OF_COND_OFF))
- for (int c = vm.rec[i].col0; c < vm.rec[i].col0 + vm.rec[i].ncol; c++) phys_collider_enable(c, obj_active(i));
+ for (int c = vm.rec[i].col0; c < vm.rec[i].col0 + vm.rec[i].ncol; c++)
+ phys_collider_enable(c, obj_active(i) && (vm.objs[i].flags & OF_COLLIDER));
}
static void fsm_start(Fsm *f);
@@ -440,6 +445,20 @@ void vm_broadcast(int 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); }
+
+/* (ResetSemiPersistentObjects: the semi persistent numbers here -1, their FSMs told RESET) */
+void vm_reset_semi(void) {
+ static const uint16_t semi[] = SEMI_PERSIST;
+ for (int i = 0; i < vm.npersist; i++) {
+ const uint8_t *p = vm.persist + 4 * i;
+ uint16_t id = rd16(p + 2);
+ bool is = false;
+ for (unsigned k = 0; k < sizeof semi / sizeof semi[0] && !is; k++) is = semi[k] == id;
+ if (!(p[1] & 0x80) || !is || p[0] >= vm.nfsms) continue;
+ set_var(&vm.fsms[p[0]], p[1] & 0x7F, (uint32_t)-1);
+ fsm_event(&vm.fsms[p[0]], VMEV_RESET);
+ }
+}
/* (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;
@@ -685,6 +704,55 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
send(f, &t, ev);
return false;
}
+ case VMOP_DAMAGERINFO: {
+ int which = rb(&r);
+ uint8_t store = rb(&r);
+ if (which == 2) set_f(f, store, vm.dmg_dir);
+ else set_var(f, store, which ? vm.dmg_type : (uint32_t)g_pd.nail_damage);
+ return true;
+ }
+ case VMOP_INTOPERATOR: {
+ /* (add, subtract, multiply, divide, max, min) */
+ int a = (int)val(f, rv(&r)), b = (int)val(f, rv(&r)), o = rb(&r);
+ uint8_t store = rb(&r);
+ bool every = rb(&r);
+ int v = o == 0 ? a + b : o == 1 ? a - b : o == 2 ? a * b : o == 3 ? (b ? a / b : 0) : o == 4 ? (a > b ? a : b)
+ : (a < b ? a : b);
+ set_var(f, store, (uint32_t)v);
+ return !every;
+ }
+ case VMOP_GETDISTANCE: {
+ int a = oval(f, rv(&r)), b = oval(f, rv(&r));
+ uint8_t store = rb(&r);
+ bool every = rb(&r);
+ float ax, ay, bx, by;
+ obj_pos(a, &ax, &ay), obj_pos(b, &bx, &by);
+ set_f(f, store, sqrtf((ax - bx) * (ax - bx) + (ay - by) * (ay - by)));
+ return !every;
+ }
+ case VMOP_SOULORBS: {
+ int lo = (int)val(f, rv(&r)), hi = (int)val(f, rv(&r));
+ float smin = fval(f, rv(&r)), smax = fval(f, rv(&r)), amin = fval(f, rv(&r)), amax = fval(f, rv(&r));
+ float vx = fval(f, rv(&r)), vy = fval(f, rv(&r)), x, y;
+ obj_pos(f->owner, &x, &y);
+ soul_orbs_fling(lo + (int)rand_range(0, (float)(hi - lo) + 0.999f), x, y, smin, smax, amin, amax, vx, vy);
+ return true;
+ }
+ case VMOP_FADETO: {
+ /* (to none or all, in its time; its children with it) */
+ int o = oval(f, rv(&r));
+ float a = fval(f, rv(&r)), t = fval(f, rv(&r));
+ bool kids = rb(&r);
+ if (!obj_ok(o)) return true;
+ for (int c = 0; c < vm.nobjs; c++) {
+ if (c != o && !(kids && under(c, o))) continue;
+ int to = a >= 0.5f ? 255 : 0, d = to - vm.objs[c].alpha;
+ int step = t > DT ? (int)(d * DT / t) : d;
+ if (step == 0) step = d > 0 ? 1 : d < 0 ? -1 : 0;
+ vm.objs[c].fade = (int8_t)(step > 127 ? 127 : step < -127 ? -127 : step);
+ }
+ return true;
+ }
case VMOP_FREEZEMOMENT: {
/* (GameManager.FreezeMoment: its kinds) */
int k = rb(&r);
@@ -953,25 +1021,26 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
int o = oval(f, rv(&r));
bool on = val(f, rv(&r)) != 0;
if (obj_ok(o)) vm.objs[o].flags = (uint16_t)(on ? vm.objs[o].flags | OF_COLLIDER : vm.objs[o].flags & ~OF_COLLIDER);
+ obj_colliders();
return true;
}
case VMOP_DESTROYOBJECT: {
int o = oval(f, rv(&r));
if (o >= O_ENT && o < O_ENT + MAX_ENTS) ent_set_enabled(o - O_ENT, false); /* (a camera lock area: gone) */
if (obj_ok(o)) {
+ obj_set_active(o, false); /* (off first: its colliders and FSMs with it) */
vm.objs[o].flags |= OF_GONE;
- obj_set_active(o, false);
}
return true;
}
case VMOP_DESTROYSELF:
- vm.objs[f->owner].flags |= OF_GONE;
obj_set_active(f->owner, false);
+ vm.objs[f->owner].flags |= OF_GONE;
return true;
case VMOP_DESTROYALLCHILDREN: {
int o = oval(f, rv(&r));
for (int c = 0; c < vm.nobjs; c++)
- if (obj_ok(o) && vm.rec[c].parent == o) vm.objs[c].flags |= OF_GONE;
+ if (obj_ok(o) && vm.rec[c].parent == o) obj_set_active(c, false), vm.objs[c].flags |= OF_GONE;
return true;
}
case VMOP_GETPOSITION: {
@@ -1257,6 +1326,7 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
case 16: hero_gravity(a0 != 0); break;
case 19: set_var(f, store, hero_can_talk()); break; /* (CanInspect: as CanTalk) */
case 20: set_var(f, store, h->accepting_input); break; /* (CanInput) */
+ case 22: hero_cancel_hero_jump(); break;
case 21: {
/* (GetState: tools/vm.py's HERO_STATES) */
int k = (int)a0;
@@ -1461,17 +1531,28 @@ void vm_activate_children(uint16_t name, bool on) {
}
/* (the nail's slash this step: the triggers it meets) */
-void vm_nail(const float *pts, int npts) {
+int vm_nail(const float *pts, int npts, float direction) {
+ int out = 0;
+ vm.nail_dir = direction;
for (int i = 0; i < vm.nobjs; i++) {
const ObjRec *r = &vm.rec[i];
float cx = vm.objs[i].x + r->bx, cy = vm.objs[i].y + r->by;
- if ((r->flags & OF_TRIGGER) && box_meets_shape(cx - r->bhx, cy - r->bhy, cx + r->bhx, cy + r->bhy, pts, npts))
+ if ((r->flags & OF_TRIGGER) && obj_active(i) && (vm.objs[i].flags & OF_COLLIDER) &&
+ box_meets_shape(cx - r->bhx, cy - r->bhy, cx + r->bhx, cy + r->bhy, pts, npts)) {
+ /* (tink_effect: the nail clinks off it as it first meets it; the Knight recoils, the camera shakes) */
+ if ((r->blend & 0x8000) && !(vm.objs[i].flags & (OF_NAIL_HIT | OF_NAIL_IN))) {
+ out |= HB_RECOIL;
+ cam_shake(SHAKE_ENEMY_KILL);
+ }
vm.objs[i].flags |= OF_NAIL_HIT;
+ }
}
+ return out;
}
/* (a spell's box: the triggers it is in, this step) */
-void vm_spell(float x0, float y0, float x1, float y1) {
+void vm_spell(float x0, float y0, float x1, float y1, float direction) {
+ vm.spell_dir = direction;
for (int i = 0; i < vm.nobjs; i++) {
const ObjRec *r = &vm.rec[i];
float cx = vm.objs[i].x + r->bx, cy = vm.objs[i].y + r->by;
@@ -1583,8 +1664,16 @@ void vm_enter(void) {
vm.nfsms = nfsms;
/* (PersistentBoolItem's Start: its FSM's Activated as the save has it) */
vm.persist = p, vm.npersist = rd16(b + 6);
- for (int i = 0; i < vm.npersist; i++, p += 4)
- if (p[0] < nfsms && persist_get(rd16(p + 2))) set_var(&vm.fsms[p[0]], p[1], 1);
+ for (int i = 0; i < vm.npersist; i++, p += 4) {
+ if (p[0] >= nfsms) continue;
+ uint16_t id = rd16(p + 2);
+ if (p[1] & 0x80) {
+ /* (PersistentIntItem: its Value plus 2, in 3 bits; none, as it was) */
+ int n = persist_get(id) | persist_get(id + 1) << 1 | persist_get(id + 2) << 2;
+ if (n) set_var(&vm.fsms[p[0]], p[1] & 0x7F, (uint32_t)(n - 2));
+ } else if (persist_get(id))
+ set_var(&vm.fsms[p[0]], p[1], 1);
+ }
vm.prev_keys = g_hero.keys;
/* (what it holds within the condition's: off too) */
for (int i = 0; i < nobjs; i++)
@@ -1613,6 +1702,18 @@ void vm_tick(void) {
o->flags = (uint16_t)((in ? o->flags | OF_INSIDE : o->flags & ~OF_INSIDE) & ~(OF_SPELL_HIT | OF_NAIL_HIT));
o->flags = (uint16_t)(spell ? o->flags | OF_SPELL_IN : o->flags & ~OF_SPELL_IN);
o->flags = (uint16_t)(nail ? o->flags | OF_NAIL_IN : o->flags & ~OF_NAIL_IN);
+ /* (damages_enemy: TAKE DAMAGE to what the nail or a spell has just come against) */
+ if ((nail && !(o->flags & OF_NAIL_WAS)) || (spell && !(o->flags & OF_SPELL_WAS))) {
+ vm.dmg_type = nail && !(o->flags & OF_NAIL_WAS) ? 0 : 2;
+ vm.dmg_dir = vm.dmg_type ? vm.spell_dir : vm.nail_dir;
+ obj_event(i, VMEV_TAKE_DAMAGE, NONE);
+ }
+ /* (iTweenFadeTo) */
+ if (o->fade) {
+ int a = o->alpha + o->fade;
+ if (a <= 0 || a >= 255) a = a <= 0 ? 0 : 255, o->fade = 0;
+ o->alpha = (uint8_t)a;
+ }
if (vm.rec[i].flags & OF_WAVE) {
/* (WaveEffectControl: its speed down by a twentieth a step, to a half at least; its timer at that speed; past 1,
* off) */
@@ -1686,11 +1787,20 @@ void vm_tick(void) {
}
for (int i = 0; i < vm.nfsms; i++) fsm_step(&vm.fsms[i], M_UPDATE);
vm.prev_keys = g_hero.keys;
- /* (SaveState: Activated into the save) */
+ /* (SaveState: Activated, or a Value, into the save) */
for (int i = 0; i < vm.npersist; i++) {
const uint8_t *p = vm.persist + 4 * i;
const Fsm *f = &vm.fsms[p[0]];
- if (p[1] < f->nvars && vm.vars[f->var0 + p[1]] && !persist_get(rd16(p + 2))) persist_set(rd16(p + 2));
+ uint16_t id = rd16(p + 2);
+ int slot = p[1] & 0x7F;
+ if (slot >= f->nvars) continue;
+ int32_t v = (int32_t)vm.vars[f->var0 + slot];
+ if (p[1] & 0x80) {
+ int n = v + 2 < 1 ? 1 : v + 2 > 7 ? 7 : v + 2;
+ for (int k = 0; k < 3; k++)
+ if ((n >> k & 1) != persist_get(id + k)) (n >> k & 1) ? persist_set(id + k) : persist_clear(id + k);
+ } else if (v && !persist_get(id))
+ persist_set(id);
}
if (vm.title_start) {
vm.title_start = false;
@@ -1733,7 +1843,7 @@ void vm_draw(void) {
if (al != 255 || (r->r & r->g & r->b) != 255) tint = obj_tint(&ntint, r->r, r->g, r->b, al);
if (!al) continue;
sprite_inst(sprite, o->x, o->y, r->z, sx, sy, tint, &in);
- in.flags = (uint8_t)((in.flags & ~F_BLEND) | r->blend);
+ in.flags = (uint8_t)((in.flags & ~F_BLEND) | (r->blend & 0xFF));
gfx_actor(&in, SORT_KEY(r->layer, r->order));
}
}
diff --git a/games/hollowknight/src/world.c b/games/hollowknight/src/world.c
index 484dec80..4421c9da 100644
--- a/games/hollowknight/src/world.c
+++ b/games/hollowknight/src/world.c
@@ -48,6 +48,13 @@ static EntState es[MAX_ENTS];
static bool hero_in_position;
bool persist_get(int i) { return i != NO_PERSIST && (g_pd.persist[i >> 3] >> (i & 7) & 1); }
+/* GameManager.ResetSemiPersistentItems: as the Knight rests at a bench or dies */
+void persist_reset_semi(void) {
+ static const uint16_t semi[] = SEMI_PERSIST;
+ for (unsigned k = 0; k < sizeof semi / sizeof semi[0]; k++) persist_clear(semi[k]);
+ vm_reset_semi();
+}
+
void persist_clear(int i) {
if (i != NO_PERSIST) g_pd.persist[i >> 3] &= (uint8_t)~(1 << (i & 7));
}
diff --git a/games/hollowknight/tests/play.c b/games/hollowknight/tests/play.c
index 3b609500..f10d9bb7 100644
--- a/games/hollowknight/tests/play.c
+++ b/games/hollowknight/tests/play.c
@@ -178,6 +178,7 @@ int main(int argc, char **argv) {
e[i].group, e[i].group2, e[i].x0, e[i].y0, e[i].x1, e[i].y1, e[i].p0, e[i].p1, e[i].p2, e[i].p3);
}
printf("end: pos %.3f,%.3f state %d\n", g_hero.body.x, g_hero.body.y, g_hero.state);
+ if (getenv("HKROOM")) printf("room: %s\n", room_name(g_room.id));
if (getenv("HKPD")) {
/* (the PlayerData bools on, by number; Hornet's Greenpath count) */
printf("pd:");
diff --git a/games/hollowknight/tools/ents.py b/games/hollowknight/tools/ents.py
index c6617129..cb49eec1 100644
--- a/games/hollowknight/tools/ents.py
+++ b/games/hollowknight/tools/ents.py
@@ -63,7 +63,7 @@ MAX_GROUPS = 256
MK_SECRET, MK_REMASK, MK_SIMPLE = 1, 2, 4
# flags
CL_PREVENT_UP, CL_PREVENT_DOWN, CL_MAX_PRIORITY = 1, 2, 4
-G_DOOR, G_ENTER_RIGHT, G_ENTER_LEFT, G_DONT_WALK_OUT, G_NON_HAZARD, G_HARD_LAND = 1, 2, 4, 8, 16, 32
+G_DOOR, G_ENTER_RIGHT, G_ENTER_LEFT, G_DONT_WALK_OUT, G_NON_HAZARD, G_HARD_LAND, G_ENTRY_ONLY = 1, 2, 4, 8, 16, 32, 64
FACING_RIGHT = 1
REC = "<BBBBHHffffffffHH" # type, flags, group, group2, a, persist, box (x0, y0, x1, y1), p0..p3, s0, s1
NO_PERSIST = 0xFFFF
@@ -72,12 +72,15 @@ NO_PERSIST = 0xFFFF
class Persist:
"""The objects whose state a save keeps (PersistentBoolItem): one bit each (or a few: a number)."""
def __init__(self):
- self.keys, self.n, self.bits = {}, 0, []
+ self.keys, self.n, self.bits, self.semi = {}, 0, [], []
- def id(self, room, path, bits=1):
+ def id(self, room, path, bits=1, semi=False):
+ """semi: semi persistent (its bits cleared as the Knight rests at a bench or dies)"""
if (room, path) not in self.keys:
self.keys[(room, path)] = self.n
self.bits.append(bits)
+ if semi:
+ self.semi += range(self.n, self.n + bits)
self.n += bits
assert self.n <= 1024, self.n # (src/game.h: MAX_PERSIST)
return self.keys[(room, path)]
@@ -1138,10 +1141,15 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0
s1=nm))
recs += _more_boxes(o)
elif cls == "TransitionPoint":
- box = _trigger(o)
+ box, entry_only = _trigger(o), 0
+ if box is None:
+ # (its collider off: a place to come in at, never left by)
+ box = next((_box(o, c) for c in o["c"] if c["type"] == "BoxCollider2D" and c.get("v") and
+ c["v"].get("m_IsTrigger")), None)
+ entry_only = G_ENTRY_ONLY
if box is None:
continue
- fl = (G_DOOR if v.get("isADoor") else 0) | (G_ENTER_RIGHT if v.get("alwaysEnterRight") else 0) | \
+ fl = entry_only | (G_DOOR if v.get("isADoor") else 0) | (G_ENTER_RIGHT if v.get("alwaysEnterRight") else 0) | \
(G_ENTER_LEFT if v.get("alwaysEnterLeft") else 0) | (G_DONT_WALK_OUT if v.get("dontWalkOutOfDoor") else 0) | \
(G_NON_HAZARD if v.get("nonHazardGate") else 0) | (G_HARD_LAND if v.get("hardLandOnExit") else 0)
target = v.get("targetScene") or ""
diff --git a/games/hollowknight/tools/pack.py b/games/hollowknight/tools/pack.py
index 71e0ede9..8231f14f 100644
--- a/games/hollowknight/tools/pack.py
+++ b/games/hollowknight/tools/pack.py
@@ -490,6 +490,10 @@ def main():
# (a Moss Knight's grass ball: a Unity sprite)
pgb = unity.prefab("sharedassets149.assets", 34)
fleurs["SPRITE_GRASS_BALL"] = SPRITES.id(pgb, next(c["v"] for c in pgb["objects"][0]["c"] if c["type"] == "SpriteRenderer")["m_Sprite"], 1)
+ # (a soul orb: Soul Orb R's sprite, as stretched as it gets; its sorting)
+ pso = unity.prefab(*vm.SOUL_ORB)
+ fleurs["SPRITE_SOUL_ORB"] = SPRITES.id(pso, next(c["v"] for c in pso["objects"][0]["c"] if c["type"] == "SpriteRenderer")["m_Sprite"], 2)
+ fleurs["SOUL_ORB_SORT"] = "{%d, %d}" % ents._sorting(pso["objects"][0])
fleurs["MSG_TABLE"] = "{%s}" % ", ".join(msgs)
# the notices (Relic Get Msg, Charm Get Msg) and the charm tutorial (Charm Tutorial Msg): their pieces, the icons the
# scripts set, the charms' icons (CharmIconList) and names
@@ -539,6 +543,8 @@ def main():
room_data(r, 1)
clip_index = {c["id"]: i for i, c in enumerate(clips)}
vm_rooms = [vm.room_blob(r, clip_index, SPRITES, ROOM_OWNERS.get((r, 0), []), PERSIST) for r in ROOMS]
+ # (the save's semi persistent bits: cleared as the Knight rests at a bench or dies)
+ fleurs["SEMI_PERSIST"] = "{%s}" % ", ".join(str(b) for b in PERSIST.semi) if PERSIST.semi else "{0xFFFF}"
sheet = text.sheets()["Prompts"]
vm_prompts = {s: TEXTS.id("Prompts", s.upper(), "PROMPT") for s in vm.STR.list if s.upper() in sheet}
for s in ("NPC Title", "Visited", "Display Right", "Hornet Saver", "Item"):
diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.py
index bbd226ce..dfd2b294 100644
--- a/games/hollowknight/tools/vm.py
+++ b/games/hollowknight/tools/vm.py
@@ -18,29 +18,39 @@ ROOMS = {
"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"],
+ "Crossroads_06": ["Set NPC Leave", "_Scenery/Raising Pillar", "_Props/Gate Switch"],
"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",
- "_Props/Knight Get Fireball", "Battle Scene/Reminder Cast", "Shiny Item"],
+ "_Props/Knight Get Fireball", "Battle Scene/Reminder Cast", "Shiny Item", "Soul Totem 2"],
# items lying about (Shiny Item: a relic, a charm), the City Crest the False Knight leaves
"Crossroads_01": ["Shiny Item"],
"Tutorial_01": ["_Props/Chest/Item"], # (its chest: src/obj.c, which turns on what is in it)
- "Fungus1_22": ["Shiny Item"],
+ "Fungus1_22": ["Shiny Item", "Gate Switch", "Metal Gate", "Breakable Wall"],
"Crossroads_10": ["Key Giver"],
# the shops: their keepers, their regions (the menu: src/shop.c)
"Room_shop": ["Basement Closed"],
"Room_mapper": ["Iselda", "Shop Region"],
"Room_Charm_Shop": ["Charm Slug", "Shop Region"],
# the grubs in their jars; the Grubfather, his rewards, the grubs back home
- "Crossroads_03": ["_Props/Grub Bottle"],
+ "Crossroads_03": ["_Props/Grub Bottle", "_Props/Toll Gate", "_Props/Toll Gate 1", "_Props/Toll Gate Switch",
+ "Break Wall 2"],
"Fungus1_21": ["Grub Bottle"],
"Crossroads_38": ["Grub King"] + ["Saved Grubs/Grub Saved %d" % n for n in range(1, 3)],
# Hornet seen in Greenpath before her arena
"Fungus1_02": ["Hornet Encounter GP1"],
"Fungus1_03": ["Set Hornet Encounter"],
"Fungus1_17": ["Set Hornet Encounter"],
- "Fungus1_31": ["Hornet Encounter Control"],
+ "Fungus1_31": ["Hornet Encounter Control", "_Props/Breakable Wall", "Toll Gate Machine", "Toll Gate Machine (1)",
+ "Toll Gate", "Toll Gate (1)"],
+ # the world's other scripted things: walls that break, floors, a soul totem, tablets, a wall that turns on
+ "Crossroads_08": ["Break Wall 2"],
+ "Crossroads_04": ["_Scenery/Break Floor 1"],
+ "Crossroads_19": ["Soul Totem mini_two_horned"],
+ "Crossroads_21": ["Breakable Wall", "Polygon_Collider_Cross_21 1/Roof Collider (1)"],
+ "Crossroads_33": ["_Props/full_wall_left"],
+ "Fungus1_32": ["Breakable Wall", "Inspect Region"],
+ "Crossroads_11_alt": ["Inspect Region"],
}
def _piece(doc, q, rigid=True):
"""A piece of debris (a sprite with a Rigidbody2D: how it falls, bounces and spins) -> FlingPiece's operands."""
@@ -102,7 +112,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", "Enviro Region"}
+SKIP_FSMS = {"npc_dream_dialogue", "Dream Dialogue", "Rotate", "Shop Open Voice", "Enviro Region", "tink_effect"}
# 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"}
@@ -176,7 +186,7 @@ for e in ("FINISHED", "CONVO_FINISH", "CONVO START", "CONVO END", "BIG TITLE STA
"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", "BOX UP YN", "BOX DOWN YN",
- "YES", "NO", "CONTINUE"):
+ "YES", "NO", "CONTINUE", "RESET"):
EVENTS.id(e)
FIXED_EVENTS = len(EVENTS.list) # (src/data.h: VMEV_*)
@@ -337,17 +347,24 @@ op("PlatformStick", ("on", "n")) # (HeroPlatformStick: the Knight on 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)
+op("DamagerInfo", ("which", "n"), ("store", "I")) # (the hit's damages_enemy: 0 damageDealt, 1 attackType, 2 direction)
+op("IntOperator", ("integer1", "i"), ("integer2", "i"), ("operation", "n"), ("storeResult", "I"), ("everyFrame", "n"))
+op("GetDistance", ("gameObject", "o"), ("target", "o"), ("storeResult", "F"), ("everyFrame", "n"))
+op("SoulOrbs", ("spawnMin", "i"), ("spawnMax", "i"), ("speedMin", "f"), ("speedMax", "f"), ("angleMin", "f"),
+ ("angleMax", "f"), ("originVariationX", "f"), ("originVariationY", "f")) # (Soul Orb R: flung, then to the Knight)
+op("FadeTo", ("gameObject", "o"), ("alpha", "f"), ("time", "f"), ("includeChildren", "n")) # (iTweenFadeTo)
# HeroController's methods the scripts call (HeroCall's method)
HERO_METHODS = ["RelinquishControl", "RegainControl", "StopAnimationControl", "StartAnimationControl", "FaceLeft",
"FaceRight", "CanTalk", "PreventCastByDialogueEnd", "SetBackOnGround", "AddMPCharge",
"FindGroundPoint", "SetBenchRespawn", "SetHazardRespawn", "RelinquishControlNotVelocity",
"SetCState", "SaveGame", "AffectedByGravity", "ResetHardLandingTimer", "StopPlayingAudio", "CanInspect",
- "CanInput", "GetState"]
+ "CanInput", "GetState", "CancelHeroJump"]
# (GetState's states, by name: its argument)
HERO_STATES = ["onGround", "attacking", "upAttacking", "downAttacking", "dashing", "backDashing"]
# the geo prefabs (Geo Small, Med, Large): GeoControl's types
GEO_PREFABS = {("resources.assets", 5736): 0, ("resources.assets", 6395): 1, ("resources.assets", 6376): 2}
+SOUL_ORB = ("resources.assets", 4231) # (Soul Orb R: src/obj.c's soul orbs)
# the prompt marker the pool gives (Arrow Prompt New): a script's own, shown and hidden as ShowPromptMarker's
PROMPT_PREFAB = ("resources.assets", 6142)
# prefabs CreateObject makes that the scripts go on with (made beforehand, off): (file, path id)
@@ -841,7 +858,9 @@ class Compiler:
"VibrationPlayerStop", "TransitionToAudioSnapshot", "SetAudioPitch", "SetAudioVolume",
"AudioPlayInState", "FadeAudio", "PlayRandomSound", "SetRotation", "RandomFloat",
"GetLastEvent", "SetBoxCollider2DSize", "Tk2dSpriteSetColor", "SetTextMeshProColor",
- "AudioPlayRandom", "SetName", "GameObjectIsNull", "PlayVibrationV2"):
+ "AudioPlayRandom", "SetName", "GameObjectIsNull", "PlayVibrationV2",
+ "SpawnFromPool", "SpawnRandomObjects", "Rotate", "GetEventSender", "SetMaterialColor",
+ "GetMaterialColor", "EaseColor"):
return None
if n == "SendEventByNameV2":
n = "SendEventByName"
@@ -849,10 +868,12 @@ class Compiler:
# (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})
+ # (the hit's damages_enemy: its damage, its attack's type (0 the nail, 2 a spell), its direction)
+ which = {"damageDealt": 0, "attackType": 1, "direction": 2}.get(P.get("variableName"))
+ if which is None:
+ self.problem("%s Damager %s" % (n, P.get("variableName")))
+ return None
+ return self.emit("DamagerInfo", {"which": which, "store": P.get("storeValue")})
if n == "GetLanguageString" and P.get("sheetName") == "Prices":
# (a price: kept for ConvertStringToInt)
import text
@@ -1161,6 +1182,8 @@ class Compiler:
return self.emit(n, P)
if n == "GetScale":
return self.emit(n, P)
+ if n == "Trigger2dEvent" and P.get("collideTag") == "Wall Breaker":
+ return None # (nothing here breaks walls but the Knight)
if n == "Trigger2dEvent":
if P.get("collideTag") not in TRIGGER_TAGS:
self.problem("Trigger2dEvent tag %s" % P.get("collideTag"))
@@ -1168,11 +1191,24 @@ 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":
+ # (the Knight against it; or, a body falling, the ground)
+ if P.get("collideTag") == "Player" or (P.get("collideTag") in (None, "") and
+ not any(c["type"] == "Rigidbody2D" for c in self.o["c"])):
return self.emit("HeroCollision", P)
return self.emit("Collision2dEvent", P)
if n == "WaitForHeroInPosition":
return self.emit(n, P)
+ if n in ("IntOperator", "GetDistance"):
+ return self.emit(n, P)
+ if n == "SetPolygonCollider":
+ return self.emit("SetCollider", P)
+ if n == "SetProperty" and not (P.get("targetProperty") or {}).get("target"):
+ return None
+ if n == "iTweenFadeTo":
+ if P.get("delay") or (P.get("loopType") or 0) or P.get("finishEvent") or P.get("speed") is not None:
+ self.problem("iTweenFadeTo %r" % P)
+ return None
+ return self.emit("FadeTo", dict(P, includeChildren=1 if P.get("includeChildren") else 0))
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)
@@ -1205,7 +1241,11 @@ class Compiler:
import ents
r = P.get("gameObject")
ref = ents._ref_file(self.o.get("_doc") or self.rm.d, [r[1], r[2]]) if isinstance(r, (list, tuple)) else None
- if ref not in GEO_PREFABS or P.get("spawnMin") != P.get("spawnMax") or P.get("originVariationX") or \
+ if ref == SOUL_ORB:
+ return self.emit("SoulOrbs", P)
+ if ref not in GEO_PREFABS:
+ return None # (rocks, dust: what breaks)
+ if P.get("spawnMin") != P.get("spawnMax") or P.get("originVariationX") or \
P.get("originVariationY") or P.get("position"):
self.problem("FlingObjectsFromGlobalPool %r" % (ref,))
return None
@@ -1351,6 +1391,13 @@ def prepare(rooms, sprites, texts):
if "Activated" in cp.slots:
rm.persist.append((len(rm.fsms) - 1, cp.slots["Activated"][0], o))
rm.persist_objs.append((len(rm.fsms) - 1, rm.obj_index[o["id"]]))
+ # (PersistentIntItem: its FSM's Value, as 3 bits (none, -1 to 6); semi persistent: none again as the
+ # Knight rests or dies)
+ pii = next((c2.get("v") for c2 in o["c"] if c2.get("class") == "PersistentIntItem"), None)
+ if pii is not None and f["vars"].get("Value", [None])[0] == "int" and "Value" in cp.slots and \
+ not any(p[0] == len(rm.fsms) - 1 for p in rm.persist):
+ rm.persist.append((len(rm.fsms) - 1, cp.slots["Value"][0] | 0x80, o,
+ bool(pii.get("semiPersistent"))))
for p in rm.problems:
print("vm:", p)
assert len(EVENTS.list) < 255, (name, len(EVENTS.list))
@@ -1436,7 +1483,8 @@ def room_blob(name, clip_index, sprites, owners=(), persist=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") 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.get("fsm") for s in c["fsm"]["states"] for a in s["actions"]) or \
+ any(e == "TAKE DAMAGE" for c in o["c"] if c.get("fsm") for s in c["fsm"]["states"] for e, _ in s["transitions"])
for c in o["c"]:
if c["type"] in ("BoxCollider2D", "CircleCollider2D", "PolygonCollider2D") and c.get("v"):
b = ents._box(o, c)
@@ -1514,6 +1562,9 @@ def room_blob(name, clip_index, sprites, owners=(), persist=None):
doc = o.get("_doc") or rm.d
blend = {"alpha": 0, "add": 1, "screen": 2, "linearlight": 3, "overlay": 4, "multiply": 5}[
scene.blend_of(unity.material(unity.ref_path(doc, m0[0]), m0[1])[1])]
+ # (tink_effect: the nail clinks off it, the Knight recoils: blend's high bit)
+ if any(c.get("fsm") and c["fsm"]["name"] == "tink_effect" for c in o["c"]):
+ blend |= 0x8000
col = (mr or {}).get("m_Color") or {"r": 1, "g": 1, "b": 1, "a": 1}
rgba = [max(0, min(255, int(round(col[k] * 255)))) for k in "rgba"]
objs += struct.pack(OBJ, o["pos"][0], o["pos"][1], o["pos"][2], sx, sy, bx, by, bhx, bhy, parent,
@@ -1522,8 +1573,9 @@ def room_blob(name, clip_index, sprites, owners=(), persist=None):
fsms = bytearray()
for di, owner, init, fname in rm.fsms:
fsms += struct.pack("<HHHH", di, owner, fname, len(init)) + b"".join(struct.pack("<I", v) for v in init)
- for fi, slot, o in rm.persist:
- fsms += struct.pack("<BBH", fi, slot, persist.id(o.get("_scene", name), o["path"]))
+ for fi, slot, o, *semi in rm.persist:
+ bits = 3 if slot & 0x80 else 1
+ fsms += struct.pack("<BBH", fi, slot, persist.id(o.get("_scene", name), o["path"], bits, semi[0] if semi else False))
head = struct.pack("<HHHH", len(rm.objs), len(rm.fsms), nmap, len(rm.persist))
return bytes(head + objs + clipmap + fsms)