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: Fungal Wastes: Sporgs and Fungus2_04

Mason36306c105711d3e
diff --git a/games/hollowknight/src/data_fw.bin b/games/hollowknight/src/data_fw.bin
index bac41584..4bcc0a27 100644
Binary files a/games/hollowknight/src/data_fw.bin and b/games/hollowknight/src/data_fw.bin differ
diff --git a/games/hollowknight/src/data_fw.h b/games/hollowknight/src/data_fw.h
index d1fc33a8..3b6b3fbf 100644
--- a/games/hollowknight/src/data_fw.h
+++ b/games/hollowknight/src/data_fw.h
@@ -18,7 +18,7 @@
#define SEC_HEADS 15
#define SEC_VM 16
#define SEC_VMDEF 17
-#define NUM_ROOMS 3
+#define NUM_ROOMS 4
#define ROOM_BASE 38
#define HK_PART_N 2
#define CROSS_HOME_ROOM 0
@@ -27,6 +27,7 @@
#define ROOM_CROSSROADS_18 0
#define ROOM_FUNGUS2_06 1
#define ROOM_FUNGUS2_05 2
+#define ROOM_FUNGUS2_04 3
#define CLIP_KNIGHT_IDLE 0
#define CLIP_KNIGHT_IDLE_HURT 1
#define CLIP_KNIGHT_IDLE_WIND 2
@@ -529,53 +530,61 @@
#define CLIP_OGRE_SPIT 499
#define CLIP_OGRE_TURN 500
#define CLIP_OGRE_WAKE 501
-#define CLIP_BGATE_BG_OPENED 502
-#define CLIP_BGATE_BG_CLOSE_1 503
-#define CLIP_BGATE_BG_CLOSE_2 504
-#define CLIP_BGATE_BG_OPEN 505
-#define CLIP_BGATE_BG_CLOSED 506
-#define CLIP_BGATE_BONE_GATE_OPENED 507
-#define CLIP_BGATE_BONE_GATE_CLOSE 508
-#define CLIP_BGATE_BONE_GATE_CLOSED 509
-#define CLIP_BGATE_BONE_GATE_OPEN 510
-#define CLIP_COCOON_COCOON_IDLE 511
-#define CLIP_COCOON_COCOON_SWEAT 512
-#define CLIP_COCOON_SCUTTLER_LAND 513
-#define CLIP_COCOON_SCUTTLER_RUN 514
-#define CLIP_FX_SPLAT 515
-#define CLIP_FX_SPLAT2 516
-#define CLIP_FIREBALL_BLAST 517
-#define CLIP_FIREBALL_BALL 518
-#define CLIP_FIREBALL_BALL_END 519
-#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 520
-#define CLIP_DRIP_IDLE 521
-#define CLIP_DRIP_DRIP 522
-#define CLIP_DRIP_FALL 523
-#define CLIP_DRIP_IMPACT 524
-#define CLIP_HORNETCS_IDLE 525
-#define CLIP_HORNETCS_JUMP_FULL 526
-#define CLIP_HORNETCS_THROW_SIDE_START 527
-#define CLIP_HORNETCS_THROW_SIDE 528
-#define CLIP_HORNETCS_HARPOON_SIDE 529
-#define CLIP_HORNETCS_THREAD_1 530
-#define CLIP_HORNETCS_POINT 531
-#define CLIP_HORNETCS_EVADE_ANTIC 532
-#define CLIP_HORNETCS_EVADE 533
-#define CLIP_HORNETCS_SOFT_LAND 534
-#define CLIP_HORNETCS_TURN 535
-#define CLIP_HORNETCS_RUN 536
-#define CLIP_BULLET_IDLE 537
-#define CLIP_BULLET_IMPACT 538
-#define CLIP_BULLET_SHOCKWAVE_SPURT 539
-#define CLIP_GLOB_IDLE 540
-#define CLIP_GLOB_LAND 541
-#define SPRITE_HERO_LIGHT 2212
-#define SPRITE_DIALOGUE_BACKBOARD 2213
-#define SPRITE_PROMPT_SHADOW 2214
-#define SPRITE_CORPSE_NAIL 2215
-#define SPRITE_FK_BARREL 2216
-#define SPRITE_FK_STAFF 2217
-#define SPRITE_DIGIT0 2457
+#define CLIP_SPORG_ATTACK 502
+#define CLIP_SPORG_DEATH 503
+#define CLIP_SPORG_EXPLODE 504
+#define CLIP_SPORG_IDLE_1 505
+#define CLIP_SPORG_IDLE_2 506
+#define CLIP_SPORG_SLEEP 507
+#define CLIP_SPORG_SLEEP_TO_IDLE 508
+#define CLIP_BGATE_BG_OPENED 509
+#define CLIP_BGATE_BG_CLOSE_1 510
+#define CLIP_BGATE_BG_CLOSE_2 511
+#define CLIP_BGATE_BG_OPEN 512
+#define CLIP_BGATE_BG_CLOSED 513
+#define CLIP_BGATE_BONE_GATE_OPENED 514
+#define CLIP_BGATE_BONE_GATE_CLOSE 515
+#define CLIP_BGATE_BONE_GATE_CLOSED 516
+#define CLIP_BGATE_BONE_GATE_OPEN 517
+#define CLIP_COCOON_COCOON_IDLE 518
+#define CLIP_COCOON_COCOON_SWEAT 519
+#define CLIP_COCOON_SCUTTLER_LAND 520
+#define CLIP_COCOON_SCUTTLER_RUN 521
+#define CLIP_FX_SPLAT 522
+#define CLIP_FX_SPLAT2 523
+#define CLIP_FX_IMPACT_LINES 524
+#define CLIP_FIREBALL_BLAST 525
+#define CLIP_FIREBALL_BALL 526
+#define CLIP_FIREBALL_BALL_END 527
+#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 528
+#define CLIP_DRIP_IDLE 529
+#define CLIP_DRIP_DRIP 530
+#define CLIP_DRIP_FALL 531
+#define CLIP_DRIP_IMPACT 532
+#define CLIP_HORNETCS_IDLE 533
+#define CLIP_HORNETCS_JUMP_FULL 534
+#define CLIP_HORNETCS_THROW_SIDE_START 535
+#define CLIP_HORNETCS_THROW_SIDE 536
+#define CLIP_HORNETCS_HARPOON_SIDE 537
+#define CLIP_HORNETCS_THREAD_1 538
+#define CLIP_HORNETCS_POINT 539
+#define CLIP_HORNETCS_EVADE_ANTIC 540
+#define CLIP_HORNETCS_EVADE 541
+#define CLIP_HORNETCS_SOFT_LAND 542
+#define CLIP_HORNETCS_TURN 543
+#define CLIP_HORNETCS_RUN 544
+#define CLIP_BULLET_IDLE 545
+#define CLIP_BULLET_IMPACT 546
+#define CLIP_BULLET_SHOCKWAVE_SPURT 547
+#define CLIP_GLOB_IDLE 548
+#define CLIP_GLOB_LAND 549
+#define SPRITE_HERO_LIGHT 2253
+#define SPRITE_DIALOGUE_BACKBOARD 2254
+#define SPRITE_PROMPT_SHADOW 2255
+#define SPRITE_CORPSE_NAIL 2256
+#define SPRITE_FK_BARREL 2257
+#define SPRITE_FK_STAFF 2258
+#define SPRITE_DIGIT0 2501
#define STYLE_DIALOGUE 0
#define STYLE_PROMPT 1
#define STYLE_TITLE_L 2
@@ -630,8 +639,9 @@
#define EK_SHRUMELING 34
#define EK_FUNGUSHUSK 35
#define EK_OGRE 36
-#define NUM_KINDS 37
-#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 198, 197, -1, -1, -1, -1, -1, -1, -1, -1, 200, 201}}, {EF_BUZZER, {203, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 205, 206}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 213, 212, -1, -1, -1, -1, -1, -1, -1, 210, 211}}, {EF_BOUNCER, {-1, -1, -1, 216, -1, -1, -1, -1, -1, -1, -1, 214, 215}}, {EF_SPITTER, {-1, -1, -1, 219, 220, 218, -1, -1, -1, -1, -1, 217, -1}}, {EF_ROLLER, {223, -1, -1, 225, 224, 226, -1, -1, -1, -1, -1, 221, 222}}, {EF_BLOCKER, {233, -1, -1, 229, 234, 227, 228, 235, 236, 232, 231, -1, 230}}, {EF_HUSK, {242, 243, 244, 237, 239, 238, -1, -1, -1, -1, -1, 240, 241}}, {EF_HUSK, {250, 251, 252, 245, 247, 246, -1, -1, -1, -1, -1, 248, 249}}, {EF_HUSK, {258, 259, 260, 253, 255, 254, -1, -1, -1, -1, -1, 256, 257}}, {EF_HUSK, {266, 267, 268, 261, 263, 262, -1, -1, -1, -1, -1, 264, 265}}, {EF_LEAPER, {272, 274, 275, 269, 273, -1, -1, -1, -1, -1, -1, 270, 271}}, {EF_GUARD, {281, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 278, 279}}, {EF_FK, {303, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 301}}, {EF_FKHEAD, {323, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 321}}, {EF_HATCHER, {-1, -1, -1, 328, 327, -1, -1, -1, -1, -1, -1, 325, 326}}, {EF_HATCHLING, {-1, -1, -1, 329, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {335, -1, -1, 333, 334, 337, 336, 330, -1, -1, -1, 331, 332}}, {EF_GFLY, {350, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 359, 360, 358, 354, 355, -1, -1, -1, -1, -1, 356, 357}}, {EF_PIGEON, {-1, -1, -1, 362, 363, 364, 361, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {366, -1, -1, 369, 368, 367, -1, -1, -1, -1, -1, 365, -1}}, {EF_SHAKER, {373, 374, 375, 370, -1, -1, -1, -1, -1, -1, -1, 371, 372}}, {EF_MOSQUITO, {380, -1, -1, 382, 381, 377, 376, -1, -1, -1, -1, 378, 379}}, {EF_FATFLY, {386, -1, -1, 383, -1, -1, -1, -1, -1, -1, -1, 384, 385}}, {EF_MOSSCHARGER, {-1, -1, -1, 387, 388, 391, 394, 393, 395, 392, -1, 389, 390}}, {EF_MOSSKNIGHT, {401, 416, 420, -1, -1, -1, -1, -1, -1, -1, -1, 396, 397}}, {EF_HORNET, {436, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 424, -1}}, {EF_MENDER, {460, -1, -1, 461, 459, -1, -1, -1, -1, -1, -1, 457, 458}}, {EF_FUNGLING, {463, -1, -1, 464, -1, -1, -1, -1, -1, -1, -1, 462, -1}}, {EF_AMBLOOM, {-1, 467, 468, -1, -1, -1, -1, -1, -1, -1, -1, 465, 466}}, {EF_FUNGOON, {471, -1, -1, 473, 472, 474, 470, -1, -1, -1, -1, 469, -1}}, {EF_SHRUMELING, {477, -1, -1, 485, 484, -1, -1, -1, -1, -1, -1, 475, 476}}, {EF_SHAKER, {489, 490, 491, 486, -1, -1, -1, -1, -1, -1, -1, 487, 488}}, {EF_OGRE, {495, 500, -1, 501, 499, 492, 497, 498, 493, 496, -1, 494, -1}}}
+#define EK_SPORG 37
+#define NUM_KINDS 38
+#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 198, 197, -1, -1, -1, -1, -1, -1, -1, -1, 200, 201}}, {EF_BUZZER, {203, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 205, 206}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 213, 212, -1, -1, -1, -1, -1, -1, -1, 210, 211}}, {EF_BOUNCER, {-1, -1, -1, 216, -1, -1, -1, -1, -1, -1, -1, 214, 215}}, {EF_SPITTER, {-1, -1, -1, 219, 220, 218, -1, -1, -1, -1, -1, 217, -1}}, {EF_ROLLER, {223, -1, -1, 225, 224, 226, -1, -1, -1, -1, -1, 221, 222}}, {EF_BLOCKER, {233, -1, -1, 229, 234, 227, 228, 235, 236, 232, 231, -1, 230}}, {EF_HUSK, {242, 243, 244, 237, 239, 238, -1, -1, -1, -1, -1, 240, 241}}, {EF_HUSK, {250, 251, 252, 245, 247, 246, -1, -1, -1, -1, -1, 248, 249}}, {EF_HUSK, {258, 259, 260, 253, 255, 254, -1, -1, -1, -1, -1, 256, 257}}, {EF_HUSK, {266, 267, 268, 261, 263, 262, -1, -1, -1, -1, -1, 264, 265}}, {EF_LEAPER, {272, 274, 275, 269, 273, -1, -1, -1, -1, -1, -1, 270, 271}}, {EF_GUARD, {281, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 278, 279}}, {EF_FK, {303, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 301}}, {EF_FKHEAD, {323, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 321}}, {EF_HATCHER, {-1, -1, -1, 328, 327, -1, -1, -1, -1, -1, -1, 325, 326}}, {EF_HATCHLING, {-1, -1, -1, 329, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {335, -1, -1, 333, 334, 337, 336, 330, -1, -1, -1, 331, 332}}, {EF_GFLY, {350, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 359, 360, 358, 354, 355, -1, -1, -1, -1, -1, 356, 357}}, {EF_PIGEON, {-1, -1, -1, 362, 363, 364, 361, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {366, -1, -1, 369, 368, 367, -1, -1, -1, -1, -1, 365, -1}}, {EF_SHAKER, {373, 374, 375, 370, -1, -1, -1, -1, -1, -1, -1, 371, 372}}, {EF_MOSQUITO, {380, -1, -1, 382, 381, 377, 376, -1, -1, -1, -1, 378, 379}}, {EF_FATFLY, {386, -1, -1, 383, -1, -1, -1, -1, -1, -1, -1, 384, 385}}, {EF_MOSSCHARGER, {-1, -1, -1, 387, 388, 391, 394, 393, 395, 392, -1, 389, 390}}, {EF_MOSSKNIGHT, {401, 416, 420, -1, -1, -1, -1, -1, -1, -1, -1, 396, 397}}, {EF_HORNET, {436, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 424, -1}}, {EF_MENDER, {460, -1, -1, 461, 459, -1, -1, -1, -1, -1, -1, 457, 458}}, {EF_FUNGLING, {463, -1, -1, 464, -1, -1, -1, -1, -1, -1, -1, 462, -1}}, {EF_AMBLOOM, {-1, 467, 468, -1, -1, -1, -1, -1, -1, -1, -1, 465, 466}}, {EF_FUNGOON, {471, -1, -1, 473, 472, 474, 470, -1, -1, -1, -1, 469, -1}}, {EF_SHRUMELING, {477, -1, -1, 485, 484, -1, -1, -1, -1, -1, -1, 475, 476}}, {EF_SHAKER, {489, 490, 491, 486, -1, -1, -1, -1, -1, -1, -1, 487, 488}}, {EF_OGRE, {495, 500, -1, 501, 499, 492, 497, 498, 493, 496, -1, 494, -1}}, {EF_SPORG, {505, -1, -1, 508, 502, 507, -1, -1, -1, -1, -1, 503, -1}}}
#define TXT_PROMPT_LISTEN 0
#define TXT_PROMPT_REST 1
#define TXT_PROMPT_INSPECT 2
@@ -833,21 +843,21 @@
#define VMEV_FIRST_MAP_UP 44
#define VMEV_FIRST_MAP_DOWN 45
#define VMEV_FK_RAGE_COMPLETE 46
-#define VMEV_UPDATE_SHAMAN {255, 255, 255}
-#define VMEV_SHOP_REGION_INACTIVE {255, 255, 255}
-#define VMEV_SHOP_REGION_ACTIVE {255, 255, 255}
+#define VMEV_UPDATE_SHAMAN {255, 255, 255, 255}
+#define VMEV_SHOP_REGION_INACTIVE {255, 255, 255, 255}
+#define VMEV_SHOP_REGION_ACTIVE {255, 255, 255, 255}
#define VMSTR_NPC_TITLE 11
#define VMSTR_VISITED 12
#define VMSTR_DISPLAY_RIGHT 13
#define VMSTR_HORNET_SAVER 14
#define VMSTR_ITEM 15
-#define STR_ATTACK_RANGE 14
-#define STR_EVADE_RANGE 15
-#define STR_SPIT_RANGE 16
-#define STR_WAKE_BOX 17
-#define STR_SLASH_HITBOX 18
-#define STR_SLASH2_HITBOX 19
-#define STR_DOOR_STAGEXIT 20
+#define STR_ATTACK_RANGE 15
+#define STR_EVADE_RANGE 16
+#define STR_SPIT_RANGE 17
+#define STR_WAKE_BOX 18
+#define STR_SLASH_HITBOX 19
+#define STR_SLASH2_HITBOX 20
+#define STR_DOOR_STAGEXIT 21
#define STR_SMASH_HITS 13
#define TITLE_KINGSPASS 0
#define TITLE_DIRTMOUTH 1
@@ -877,35 +887,36 @@
#define TITLE_MAGE_TOWER 25
#define NUM_TITLES 26
#define TITLE_TABLE {{15, 16, -1, -1}, {17, 18, 19, -1}, {20, 21, -1, 22}, {23, 24, -1, 25}, {26, 27, -1, 28}, {29, 30, -1, -1}, {31, 32, 33, -1}, {34, 35, -1, -1}, {36, 37, -1, -1}, {38, 39, -1, -1}, {40, 41, -1, -1}, {42, 43, -1, -1}, {44, 45, -1, -1}, {46, 47, -1, -1}, {48, 49, -1, 50}, {51, 52, -1, 53}, {51, 52, -1, 54}, {55, 56, 57, -1}, {55, 56, -1, -1}, {58, 59, -1, 60}, {61, 62, -1, 63}, {64, 65, -1, 66}, {67, 68, -1, 69}, {70, 71, -1, 63}, {72, 73, -1, -1}, {74, 75, 76, -1}}
-#define SPRITE_FLEUR_TOP 2218
+#define SPRITE_FLEUR_TOP 2259
#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 2219
+#define SPRITE_FLEUR_BOT 2260
#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 VM_PIECE_BASE 2212
-#define SPRITE_MSG_BG 2220
-#define SPRITE_MSG_STOP 2221
-#define SPRITE_MSG_FLEUR 2222
-#define SPRITE_MSG_KEY 2223
-#define SPRITE_MSG_ICON_FIREBALL 2224
-#define SPRITE_MSG_ICON_DASH 2225
-#define SPRITE_GRASS_BALL 2226
-#define SPRITE_GAS 2227
-#define SPRITE_SOUL_ORB 2228
+#define VM_PIECE_BASE 2253
+#define SPRITE_MSG_BG 2261
+#define SPRITE_MSG_STOP 2262
+#define SPRITE_MSG_FLEUR 2263
+#define SPRITE_MSG_KEY 2264
+#define SPRITE_MSG_ICON_FIREBALL 2265
+#define SPRITE_MSG_ICON_DASH 2266
+#define SPRITE_GRASS_BALL 2267
+#define SPRITE_GAS 2268
+#define SPRITE_GAS_FLASH 2269
+#define SPRITE_SOUL_ORB 2270
#define SOUL_ORB_SORT {13, 0}
#define MSG_TABLE {{77, 78, 79, 80, 81, 82}, {83, 84, 85, 86, 87, 88}}
-#define NOTICE_BACKBOARD {2229, 1.0000f, 0.6931f}
-#define TUTE_FLEUR {2222, 1.0000f, 1.0000f}
-#define TUTE_BACKBOARD {2230, 1.0000f, 0.9560f}
-#define TUTE_IMAGE {2231, 1.0000f, 1.0000f}
-#define TUTE_STOP {2221, 1.0000f, 1.0000f}
-#define FOCUS_PROMPT_BG {2232, 0.0000f, -1.7900f, 1.0000f, 1.0000f}
+#define NOTICE_BACKBOARD {2271, 1.0000f, 0.6931f}
+#define TUTE_FLEUR {2263, 1.0000f, 1.0000f}
+#define TUTE_BACKBOARD {2272, 1.0000f, 0.9560f}
+#define TUTE_IMAGE {2273, 1.0000f, 1.0000f}
+#define TUTE_STOP {2262, 1.0000f, 1.0000f}
+#define FOCUS_PROMPT_BG {2274, 0.0000f, -1.7900f, 1.0000f, 1.0000f}
#define FOCUS_PROMPT_TEXTS {{89, 0.1765f, -2.3773f, 0}, {90, 0.1765f, -3.1983f, 0}, {91, -0.0488f, -4.1348f, 1}, {92, 0.2240f, -5.2114f, 0}}
#define FOCUS_PROMPT_KEY {82, 0.4659f, -4.4341f}
#define NOTICE_ICONS {-1}
#define CHARM_ICON_K 1.5000f
-#define CHARM_ICONS {-1, 2233, 2234, 2235, 2236, -1, 2237, 2238, 2239, -1, -1, -1, -1, -1, 2240, -1, -1, -1, 2241, 2242, 2243, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CHARM_ICONS {-1, 2275, 2276, 2277, 2278, -1, 2279, 2280, 2281, -1, -1, -1, -1, -1, 2282, -1, -1, -1, 2283, 2284, 2285, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
#define CHARM_NAMES {-1, 93, 94, 95, 96, -1, 97, 98, 99, -1, -1, -1, -1, -1, 100, -1, -1, -1, 101, 102, 103, -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 104
#define TXT_CHARM_TUTE_SUB 105
@@ -913,38 +924,38 @@
#define TXT_YN_YES 107
#define TXT_YN_NO 108
#define TXT_YN_NOT_ENOUGH 109
-#define MENU_LOGO {2244, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_LOGO {2286, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_LOGO_Y 3.6585f
#define MENU_START_Y -1.4181f
#define MENU_HELP_Y -2.3582f
#define MENU_QUIT_Y -3.2982f
-#define MENU_POINTER {2245, 0.0000f, 0.0000f, 1.0023f, 1.0000f}
+#define MENU_POINTER {2287, 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 {2246, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
+#define MENU_PROFILES_FLEUR {2288, 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, {2247, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2248, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2249, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2250, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {9, {2251, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2252, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {24, {2253, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {35, {2254, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
+#define MENU_SLOT_ZONES {{2, {2289, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2290, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2291, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2292, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {9, {2293, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2294, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {24, {2295, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {35, {2296, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
#define MENU_SLOT_NZONES 8
#define MENU_SLOT_BG_DY 0.0102f
-#define MENU_SLOT_FLEUR {2255, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_FLEUR {2297, 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 {2256, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_SELECTOR {2298, 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 {2257, 0.0000f, 0.0000f, 1.0000f, 1.0025f}
+#define MENU_SLOT_CURSOR {2299, 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 {2258, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_ORB {2300, 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 {2259, 0.0000f, 0.0000f, 1.0039f, 1.0000f}
+#define MENU_SLOT_GEO {2301, 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 {2260, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_HEALTH {2302, 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
@@ -962,15 +973,15 @@
#define MENU_SLOT_YES_X 2.5813f
#define MENU_SLOT_NO_X 6.2296f
#define MENU_BACK_Y -5.5406f
-#define MENU_PAUSE_TOP {2261, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_TOP {2303, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_PAUSE_TOP_Y 2.3653f
-#define MENU_PAUSE_BOT {2262, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_BOT {2304, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_PAUSE_BOT_Y -1.8877f
#define MENU_PAUSE_CONTINUE_Y 1.1916f
#define MENU_PAUSE_HELP_Y 0.0940f
#define MENU_PAUSE_QUIT_Y -1.0035f
#define MENU_KEYS_TITLE_Y 5.7763f
-#define MENU_KEYS_FLEUR {2246, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
+#define MENU_KEYS_FLEUR {2288, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
#define MENU_KEYS_FLEUR_Y 4.7346f
#define MENU_KEYS_ROW_Y 3.1809f
#define MENU_KEYS_DY -1.0162f
@@ -1003,39 +1014,39 @@
#define TXT_CROSS_NEW 162
#define INV_X -4.0500f
#define INV_Y 7.5500f
-#define INV_BORDER {{2263, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2263, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2264, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2265, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2266, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2267, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
+#define INV_BORDER {{2305, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2305, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2306, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2307, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2308, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2309, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
#define INV_NBORDER 6
-#define INV_FRAME {2268, 4.0479f, -7.1963f, 1.0f, 1.0f}
-#define INV_ARROW_L {2269, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
-#define INV_ARROW_R {2269, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_L {2270, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_R {2270, 18.0400f, -0.4300f, 1.0000f, 1.0000f}
+#define INV_FRAME {2310, 4.0479f, -7.1963f, 1.0f, 1.0f}
+#define INV_ARROW_L {2311, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
+#define INV_ARROW_R {2311, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_L {2312, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_R {2312, 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 {165, 166, 167, 168}
-#define CH_BB {2271, -7.9200f, -8.3700f, 1.0000f, 1.0000f}
+#define CH_BB {2313, -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 {2272, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
+#define CH_GLOW {2314, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
#define CH_GLOW_A 0.6970f
-#define CH_ICONS {-1, 2233, 2234, 2235, 2236, -1, 2237, 2238, 2239, -1, -1, -1, -1, -1, 2240, -1, -1, -1, 2241, 2242, 2243, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define CH_NEXT_DOT {2273, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_ICONS {-1, 2275, 2276, 2277, 2278, -1, 2279, 2280, 2281, -1, -1, -1, -1, -1, 2282, -1, -1, -1, 2283, 2284, 2285, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CH_NEXT_DOT {2315, 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 {2274, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
-#define CH_NOTCH_EMPTY {2275, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_FULL {2316, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_EMPTY {2317, 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 {2276, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
+#define CH_DIVIDER {2318, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}
-#define CH_COST_PIP {2274, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_COST_PIP {2316, 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
@@ -1044,9 +1055,9 @@
#define CH_NAME {12.4800f, -2.2710f, 8.8867f}
#define CH_DESC {8.0382f, -7.3673f, 8.8867f}
#define CH_CONFIRM {15.7465f, -13.0221f, 15.3500f}
-#define CH_CONFIRM_KEY {2277, 16.3208f, -13.2878f, 1.0f, 1.0f}
+#define CH_CONFIRM_KEY {2319, 16.3208f, -13.2878f, 1.0f, 1.0f}
#define CH_CONFIRM_KEY_W 0.6412f
-#define CH_CURSOR {2278, 0.0000f, 0.0000f, 1.0000f, 0.9756f}
+#define CH_CURSOR {2320, 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 169
@@ -1061,23 +1072,23 @@
#define TXT_CHARM_DESCS {-1, 188, 189, 190, 191, -1, 192, 193, 194, -1, -1, -1, -1, -1, 195, -1, -1, -1, 196, 197, 198, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
#define TXT_KEY_OK 199
#define TXT_CHARM_BENCH 200
-#define INV_FIXED {{2279, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2280, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2281, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2282, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2283, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2284, -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}, {2285, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2286, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}
+#define INV_FIXED {{2321, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2322, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2323, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2324, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2325, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2326, -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}, {2327, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2328, -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 {{2287, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2288, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2289, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2290, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
-#define INV_VESSEL_PIECES {{2291, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2292, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2293, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}
+#define INV_HEART_PIECES {{2329, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2330, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2331, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2332, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
+#define INV_VESSEL_PIECES {{2333, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2334, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2335, -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 {{2294, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2295, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2296, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2297, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2298, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2299, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}
+#define INV_EQ {{2336, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2337, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2338, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2339, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2340, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2341, 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 {{2300, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2301, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2302, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2303, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}
+#define INV_TRINKETS {{2342, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2343, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2344, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2345, 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 {2304, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
-#define INV_DIVIDERS {{2305, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2305, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}
+#define INV_TRINKET_BB {2346, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
+#define INV_DIVIDERS {{2347, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2347, 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 {{201, 202}, {203, 204}, {205, 206}, {203, 207}, {203, 208}, {209, 210}}
@@ -1086,15 +1097,15 @@
#define TXT_INV_EQ {{226, 227}, {228, 229}, {230, 231}, {232, 233}, {234, 235}, {236, 237}}
#define TXT_INV_QUILL {238, 239, 240, 241}
#define TXT_INV_TRINKETS {{242, 243}, {244, 245}, {246, 247}, {248, 249}}
-#define SHOP_BACKBOARD {2306, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
-#define SHOP_MASK_TOP {2307, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
-#define SHOP_MASK_BOTTOM {2308, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
-#define SHOP_ARROW_U {2309, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
-#define SHOP_ARROW_D {2309, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
-#define SHOP_SELECTOR {2310, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
-#define SHOP_CONFIRM_GEO {2311, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
-#define SHOP_POINTER_L {2312, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
-#define SHOP_POINTER_R {2312, 6.6249f, -2.0798f, -1.0000f, 1.0000f}
+#define SHOP_BACKBOARD {2348, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
+#define SHOP_MASK_TOP {2349, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
+#define SHOP_MASK_BOTTOM {2350, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
+#define SHOP_ARROW_U {2351, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
+#define SHOP_ARROW_D {2351, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
+#define SHOP_SELECTOR {2352, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
+#define SHOP_CONFIRM_GEO {2353, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_L {2354, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_R {2354, 6.6249f, -2.0798f, -1.0000f, 1.0000f}
#define SHOP_MASK_A {0, 0, 255, 255, 255, 255, 255, 254, 249, 230, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 73, 134, 178, 204, 226, 223, 0, 0, 0, 0, 0, 0}
#define SHOP_CONFIRM_ITEM {5.0900f, 2.4700f}
#define TXT_KEY_BACK 251
@@ -1114,7 +1125,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 {2313, 5.5100f, 2.5800f, 1.0000f, 1.0000f}
+#define SHOP_PEG {2355, 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}
@@ -1135,9 +1146,9 @@
#define TXT_SHOP_YES 261
#define TXT_SHOP_NO 262
#define SHOP_DESC_BOTTOM -5.0500f
-#define SHOP_ITEMS {{2315, 0.5714f, 263, 264, 150, 1, 125, -1, 0, 0}, {2315, 0.5714f, 263, 265, 500, 1, 126, 125, 0, 0}, {2316, 0.5714f, 266, 267, 550, 3, 127, -1, 0, 0}, {2317, 0.5714f, 268, 269, 950, 10, 128, -1, 0, 0}, {2318, 0.5714f, 270, 271, 300, 2, 37, -1, 0, 1}, {2319, 0.5714f, 272, 273, 200, 2, 40, -1, 0, 4}, {2320, 0.5714f, 274, 275, 1800, 0, 119, -1, 0, 0}, {2321, 0.5714f, 276, 277, 60, 11, 129, -1, 0, 0}, {2322, 0.5714f, 278, 279, 220, 2, 38, -1, 0, 2}, {2323, 0.5714f, 280, 281, 120, 0, 2, -1, 0, 0}, {2324, 0.5714f, 282, 283, 40, 9, 130, 10, 0, 0}, {2324, 0.5714f, 284, 285, 80, 9, 131, 28, 0, 0}, {2325, 0.5714f, 286, 287, 100, 16, 133, -1, 0, 0}, {2326, 0.5714f, 288, 289, 100, 16, 134, -1, 0, 0}, {2327, 0.5714f, 290, 291, 100, 16, 135, -1, 0, 0}, {2328, 0.5714f, 292, 293, 100, 16, 137, 147, 0, 0}, {2329, 0.5714f, 294, 295, 100, 16, 136, -1, 0, 0}, {2330, 0.5714f, 296, 297, 100, 17, 139, -1, 0, 0}, {2331, 0.5714f, 298, 299, 100, 17, 140, -1, 0, 0}, {2332, 0.5714f, 300, 301, 100, 17, 141, 14, 0, 0}, {2333, 0.5714f, 302, 303, 210, 17, 142, 14, 0, 0}, {2334, 0.5714f, 304, 305, 250, 2, 44, -1, 0, 8}, {2335, 0.5714f, 306, 307, 300, 2, 54, -1, 0, 18}, {2336, 0.5714f, 308, 309, 120, 2, 50, -1, 0, 14}, {2337, 0.5714f, 310, 311, 220, 2, 55, -1, 0, 19}, {2338, 0.5714f, 312, 313, 800, 2, 43, -1, 0, 7}, {2339, 0.5714f, 314, 315, 120, 8, 143, -1, 5, 0}, {2339, 0.5714f, 314, 315, 500, 8, 144, -1, 10, 0}, {2339, 0.5714f, 314, 315, 900, 8, 145, -1, 18, 0}, {2339, 0.5714f, 314, 316, 1400, 8, 146, -1, 25, 0}}
+#define SHOP_ITEMS {{2357, 0.5714f, 263, 264, 150, 1, 125, -1, 0, 0}, {2357, 0.5714f, 263, 265, 500, 1, 126, 125, 0, 0}, {2358, 0.5714f, 266, 267, 550, 3, 127, -1, 0, 0}, {2359, 0.5714f, 268, 269, 950, 10, 128, -1, 0, 0}, {2360, 0.5714f, 270, 271, 300, 2, 37, -1, 0, 1}, {2361, 0.5714f, 272, 273, 200, 2, 40, -1, 0, 4}, {2362, 0.5714f, 274, 275, 1800, 0, 119, -1, 0, 0}, {2363, 0.5714f, 276, 277, 60, 11, 129, -1, 0, 0}, {2364, 0.5714f, 278, 279, 220, 2, 38, -1, 0, 2}, {2365, 0.5714f, 280, 281, 120, 0, 2, -1, 0, 0}, {2366, 0.5714f, 282, 283, 40, 9, 130, 10, 0, 0}, {2366, 0.5714f, 284, 285, 80, 9, 131, 28, 0, 0}, {2367, 0.5714f, 286, 287, 100, 16, 133, -1, 0, 0}, {2368, 0.5714f, 288, 289, 100, 16, 134, -1, 0, 0}, {2369, 0.5714f, 290, 291, 100, 16, 135, -1, 0, 0}, {2370, 0.5714f, 292, 293, 100, 16, 137, 147, 0, 0}, {2371, 0.5714f, 294, 295, 100, 16, 136, -1, 0, 0}, {2372, 0.5714f, 296, 297, 100, 17, 139, -1, 0, 0}, {2373, 0.5714f, 298, 299, 100, 17, 140, -1, 0, 0}, {2374, 0.5714f, 300, 301, 100, 17, 141, 14, 0, 0}, {2375, 0.5714f, 302, 303, 210, 17, 142, 14, 0, 0}, {2376, 0.5714f, 304, 305, 250, 2, 44, -1, 0, 8}, {2377, 0.5714f, 306, 307, 300, 2, 54, -1, 0, 18}, {2378, 0.5714f, 308, 309, 120, 2, 50, -1, 0, 14}, {2379, 0.5714f, 310, 311, 220, 2, 55, -1, 0, 19}, {2380, 0.5714f, 312, 313, 800, 2, 43, -1, 0, 7}, {2381, 0.5714f, 314, 315, 120, 8, 143, -1, 5, 0}, {2381, 0.5714f, 314, 315, 500, 8, 144, -1, 10, 0}, {2381, 0.5714f, 314, 315, 900, 8, 145, -1, 18, 0}, {2381, 0.5714f, 314, 316, 1400, 8, 146, -1, 25, 0}}
#define SHOP_FIRST {0, 8, 21, 30}
-#define SHOP_ROW_GEO {2314, 1.4551f, 0.0000f, 1.0000f, 1.0000f}
+#define SHOP_ROW_GEO {2356, 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}
@@ -1152,21 +1163,21 @@
#define COLLECT_MOVER_TO {-7.7000f, 6.0400f}
#define STAG_AT {0.3000f, 0.3000f}
#define STAG_K 1.2646f
-#define STAG_BACKING {2340, -0.4427f, 0.0000f, 1.0000f, 0.6408f}
+#define STAG_BACKING {2382, -0.4427f, 0.0000f, 1.0000f, 0.6408f}
#define STAG_BACKING_A 0.9020f
-#define STAG_PIECES {{2341, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2342, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2343, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {2344, 0.4147f, 1.5909f, 1.0000f, 1.0000f}}
+#define STAG_PIECES {{2383, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2384, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2385, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {2386, 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 {2345, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
-#define STAG_MAP_SHADOW {2346, 0.0110f, -0.0100f, 1.0000f, 0.9227f}
+#define STAG_MAP_KNIGHT {2387, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define STAG_MAP_SHADOW {2388, 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 {2347, 2.8680f, 0.6180f, -1.0000f, 1.0000f}
-#define STAG_POINTER_L {2347, -2.8680f, 0.6180f, 1.0000f, 1.0000f}
+#define STAG_POINTER_R {2389, 2.8680f, 0.6180f, -1.0000f, 1.0000f}
+#define STAG_POINTER_L {2389, -2.8680f, 0.6180f, 1.0000f, 1.0000f}
#define STAG_ROW {-7.5992f, 3.9576f}
-#define STAG_LIST_KNIGHT {2345, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
-#define STAG_DIVIDER {2348, -7.6003f, 5.2734f, -1.0000f, -0.8696f}
+#define STAG_LIST_KNIGHT {2387, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
+#define STAG_DIVIDER {2390, -7.6003f, 5.2734f, -1.0000f, -0.8696f}
#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}
#define TXT_STAG_STATIONS 321
#define TXT_STAG_NAMES {322, 282, 284}
@@ -1182,52 +1193,52 @@
#define STAG_SCENES_STR {3, 4, 5}
#define STAG_SCENES_ROOM {32772, 32787, 32804}
#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 327, 0x0u}, {2, 18, 130, -0.0400f, -7.8800f, 328, 0x20u}, {20, 12, 131, 16.3100f, -7.8700f, 330, 0x0u}}
-#define MAP_ROOMS {{0, 255, 2349, 2350, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 255, 2356, 2357, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 127, 2359, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 2360, 2361, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 255, 2362, 2363, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 255, 2364, 2365, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 255, 2366, 2367, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 255, 2368, 2369, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2370, 2371, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 38, 2372, -1, -2.2000f, 3.7130f, 0.6600f, 0.7900f, 0xB5DDFB, 0}, {1, 255, 2373, 2374, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 255, 2375, 2376, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 2377, 2378, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2379, 2380, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2381, 2382, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 255, 2383, 2384, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 255, 2385, 2386, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 255, 2387, 2388, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 255, 2389, 2390, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2391, 2392, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 2393, 2394, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 255, 2395, 2396, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 255, 2397, 2398, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 2399, 2400, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 255, 2401, 2402, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 2403, 2404, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 255, 2405, 2406, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 2407, 2408, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 255, 2409, 2410, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 255, 2411, 2412, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 255, 2413, 2414, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 255, 2415, 2416, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}
-#define MAP_PINS {{0, 0, 2351, -2.0390f, 7.7500f, 133, -1}, {0, 0, 2352, -1.6430f, 7.7500f, 137, -1}, {0, 0, 2353, -2.4700f, 7.7500f, 135, 122}, {0, 0, 2354, -1.2540f, 7.7600f, 135, 123}, {1, 1, 2358, -6.2100f, 7.6800f, 134, -1}, {21, 1, 2358, -10.9970f, 6.6240f, 134, -1}, {22, 0, 2351, -11.2580f, 4.9690f, 133, -1}, {30, 0, 2351, -7.6610f, 6.0700f, 133, -1}}
-#define MAP_NEXT {{0, 2355, -1.0730f, 6.4850f, 180.0000f, 326, -1.0730f, 6.1870f, 1, -1}, {19, 2355, -1.0730f, 7.2500f, 0.0000f, 325, -1.0930f, 7.9120f, 1, -1}, {31, 2355, -4.5300f, 5.8450f, -90.0000f, 326, -4.1075f, 6.0470f, 0, 6}}
+#define MAP_ROOMS {{0, 255, 2391, 2392, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 255, 2398, 2399, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 127, 2401, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 2402, 2403, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 255, 2404, 2405, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 255, 2406, 2407, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 255, 2408, 2409, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 255, 2410, 2411, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2412, 2413, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 38, 2414, -1, -2.2000f, 3.7130f, 0.6600f, 0.7900f, 0xB5DDFB, 0}, {1, 255, 2415, 2416, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 255, 2417, 2418, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 2419, 2420, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2421, 2422, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2423, 2424, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 255, 2425, 2426, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 255, 2427, 2428, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 255, 2429, 2430, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 255, 2431, 2432, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2433, 2434, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 2435, 2436, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 255, 2437, 2438, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 255, 2439, 2440, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 2441, 2442, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 255, 2443, 2444, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 2445, 2446, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 255, 2447, 2448, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 2449, 2450, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 255, 2451, 2452, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 255, 2453, 2454, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 255, 2455, 2456, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 255, 2457, 2458, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}
+#define MAP_PINS {{0, 0, 2393, -2.0390f, 7.7500f, 133, -1}, {0, 0, 2394, -1.6430f, 7.7500f, 137, -1}, {0, 0, 2395, -2.4700f, 7.7500f, 135, 122}, {0, 0, 2396, -1.2540f, 7.7600f, 135, 123}, {1, 1, 2400, -6.2100f, 7.6800f, 134, -1}, {21, 1, 2400, -10.9970f, 6.6240f, 134, -1}, {22, 0, 2393, -11.2580f, 4.9690f, 133, -1}, {30, 0, 2393, -7.6610f, 6.0700f, 133, -1}}
+#define MAP_NEXT {{0, 2397, -1.0730f, 6.4850f, 180.0000f, 326, -1.0730f, 6.1870f, 1, -1}, {19, 2397, -1.0730f, 7.2500f, 0.0000f, 325, -1.0930f, 7.9120f, 1, -1}, {31, 2397, -4.5300f, 5.8450f, -90.0000f, 326, -4.1075f, 6.0470f, 0, 6}}
#define MAP_NAMES {{0, -1, 324, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 325, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 326, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {2, -1, 329, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}
#define MAP_QUICK_K 1.5500f
-#define MAP_SHADE {{2417, 0.0055f, -0.0110f, 178}, {2418, 0.0000f, 0.0000f, 255}}
-#define MAP_MARKERS {2419, 2420, 2421, 2422}
+#define MAP_SHADE {{2459, 0.0055f, -0.0110f, 178}, {2460, 0.0000f, 0.0000f, 255}}
+#define MAP_MARKERS {2461, 2462, 2463, 2464}
#define MAP_COMPASS_K 0.7000f
#define MAP_BG_A 0.4438f
#define MAP_TITLE {0.0000f, 7.5363f}
-#define MAP_TITLE_BACK {2423, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}
-#define MAP_NO_MAP {2424, 0.0000f, 0.9400f}
+#define MAP_TITLE_BACK {2465, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}
+#define MAP_NO_MAP {2466, 0.0000f, 0.9400f}
#define MAP_NO_MAP_MSG {331, -0.0600f, -1.2932f}
-#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 332, 2425, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}
+#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 332, 2467, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}
#define MAP_MSG_K 0.7000f
#define FIRSTMAP_BG_A 0.6410f
#define FIRSTMAP_TEXTS {{333, 0.0000f, 5.0305f}, {91, 0.0000f, -0.8796f}, {334, 0.0000f, -3.2895f}, {335, 0.0000f, -4.6996f}}
-#define FIRSTMAP_PIECES {{2426, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {2427, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {2428, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}
+#define FIRSTMAP_PIECES {{2468, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {2469, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {2470, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}
#define FIRSTMAP_KEY {336, 0.0900f, -2.3200f}
-#define MAP_WIDE {{{2429, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 337, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{2430, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 338, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{2431, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 339, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}}
+#define MAP_WIDE {{{2471, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 337, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{2472, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 338, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{2473, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 339, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}}
#define MAP_WIDE_GREY 0x5C
#define MAP_WIDE_NAME_GREY 0x5B
#define MAP_WIDE_COMPASS_K 0.8700f
#define MAP_ZOOM {0.2800f, -2.8000f, 0.4360f, 1.3000f}
#define MAP_PAN {-1.4400f, 4.5500f, -8.6420f, -5.5800f}
#define MAP_PAN_SPEED 8.0000f
-#define MAP_PAN_ARROWS {{2432, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {2432, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {2432, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {2432, 17.1900f, -7.1700f, 1.0f, -90.0000f}}
-#define MAP_ACT_CONFIRM {{2433, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {340, 341, 341}}
-#define MAP_ACT_MARKER {{2433, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {342, 343, 344}}
-#define MAP_ACT_CANCEL {{2433, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {257, 257, 257}}
-#define MAP_ACT_CHANGE {{2433, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {345, 345, 345}}
-#define MAP_ACT_KEY {{2433, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {346, 347, 348}}
-#define MAP_KEY_BB {2434, 13.6200f, 3.4200f, 0.3781f, 1.0000f}
+#define MAP_PAN_ARROWS {{2474, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {2474, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {2474, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {2474, 17.1900f, -7.1700f, 1.0f, -90.0000f}}
+#define MAP_ACT_CONFIRM {{2475, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {340, 341, 341}}
+#define MAP_ACT_MARKER {{2475, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {342, 343, 344}}
+#define MAP_ACT_CANCEL {{2475, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {257, 257, 257}}
+#define MAP_ACT_CHANGE {{2475, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {345, 345, 345}}
+#define MAP_ACT_KEY {{2475, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {346, 347, 348}}
+#define MAP_KEY_BB {2476, 13.6200f, 3.4200f, 0.3781f, 1.0000f}
#define MAP_KEY_STEP -0.8250f
-#define MAP_KEY_ROWS {{{2435, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 349, {12.7550f, -1.5413f, 15.3500f}}, {{2436, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 350, {12.7550f, -1.5413f, 15.3500f}}, {{2437, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 351, {12.7550f, -1.5413f, 15.3500f}}, {{2438, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 352, {12.7550f, -1.5413f, 15.3500f}}, {{2439, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 353, {12.7550f, -1.5413f, 15.3500f}}}
+#define MAP_KEY_ROWS {{{2477, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 349, {12.7550f, -1.5413f, 15.3500f}}, {{2478, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 350, {12.7550f, -1.5413f, 15.3500f}}, {{2479, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 351, {12.7550f, -1.5413f, 15.3500f}}, {{2480, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 352, {12.7550f, -1.5413f, 15.3500f}}, {{2481, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 353, {12.7550f, -1.5413f, 15.3500f}}}
#define MAP_KEY_FLAGS {133, 134, 135, 136, 137}
#define MAP_KEY_N 5
-#define MAP_MM_PIECES {{2440, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {2441, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {2442, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {2443, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}
-#define MAP_MM_MARKERS {2444, 2445, 2446, 2447}
+#define MAP_MM_PIECES {{2482, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {2483, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {2484, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {2485, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}
+#define MAP_MM_MARKERS {2486, 2487, 2488, 2489}
#define MAP_MM_AMOUNT {0.0000f, -0.6416f, 1.0614f}
#define MAP_MM_ROW {0.0000f, 0.4400f, 1.9000f, 1.4333f, -12.8200f}
-#define MAP_MM_PLACE {2448, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}
+#define MAP_MM_PLACE {2490, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}
#define MAP_MM_RADII 0.8900f
#define MAP_MM_UI_PAUSE 0.2000f
#define TXT_KEY_SHIFT 354
-#define ROOM_ZONES {5, 9, 9}
+#define ROOM_ZONES {5, 9, 9, 9}
#define MSG_FIREBALL 0
#define MSG_DASH 1
#define SEMI_PERSIST {13, 14, 15, 16}
diff --git a/games/hollowknight/src/enemy.c b/games/hollowknight/src/enemy.c
index 79452b06..74a230d3 100644
--- a/games/hollowknight/src/enemy.c
+++ b/games/hollowknight/src/enemy.c
@@ -20,7 +20,7 @@ enum {
EF_FK, EF_FKHEAD, EF_GFLY, EF_HATCHER, EF_HATCHLING, EF_SLUG, EF_MOSSWALKER, EF_PIGEON, EF_PLANTTRAP, EF_SHAKER,
EF_MOSQUITO, EF_FATFLY, EF_MOSSCHARGER, EF_MOSSKNIGHT, EF_HORNET, EF_MENDER,
/* (Hollow Knight: Fungal Wastes: HK_FW) */
- EF_FUNGLING, EF_FUNGOON, EF_AMBLOOM, EF_SHRUMELING, EF_OGRE
+ EF_FUNGLING, EF_FUNGOON, EF_AMBLOOM, EF_SHRUMELING, EF_OGRE, EF_SPORG
};
enum { R_IDLE, R_TURN, R_WALK, R_A1, R_A2, R_A3, R_A4, R_A5, R_A6, R_A7, R_A8, R_DEATH_AIR, R_DEATH_LAND, NUM_ROLES };
typedef struct {
@@ -6572,7 +6572,7 @@ void enemies_fixed(void) {
continue;
}
if (e->mode == EM_ALIVE && (FSM(e) == EF_FKHEAD || (e->flags & 128))) continue; /* (the head: its body's; off) */
- if (e->mode == EM_ALIVE && ((FSM(e) == EF_MOSSWALKER && e->b1) || FSM(e) == EF_PIGEON || FSM(e) == EF_PLANTTRAP)) {
+ if (e->mode == EM_ALIVE && ((FSM(e) == EF_MOSSWALKER && e->b1) || FSM(e) == EF_PIGEON || FSM(e) == EF_PLANTTRAP || FSM(e) == EF_SPORG)) {
/* (a kinematic body, a trigger, frames' colliders: nothing stops them) */
recoil_fixed(e);
if (FSM(e) == EF_MOSSWALKER) mosswalker_fixed(e);
diff --git a/games/hollowknight/src/enemy_fw.c b/games/hollowknight/src/enemy_fw.c
index d96b37f3..b4a77313 100644
--- a/games/hollowknight/src/enemy_fw.c
+++ b/games/hollowknight/src/enemy_fw.c
@@ -639,25 +639,216 @@ int enemies_wave_hp(int wave) {
return -1;
}
+/* ---------------------------------------------------------------- Spore Bombs: flung, they chase the Knight a while,
+ * then swell and burst in a Gas Explosion that hurts all about; the nail or the Knight touching one bursts it at once */
+#define MAX_BOMBS 6
+#define BOMB_R (0.19f * 1.5f)
+enum { BB_OFF, BB_WAIT, BB_CHASE, BB_READY, BB_BOOM };
+typedef struct {
+ uint8_t st;
+ float x, y, vx, vy, t, ang;
+ Anim anim, lines;
+} Bomb;
+static Bomb bombs[MAX_BOMBS];
+
+static void bomb_fire(float x, float y, float deg) {
+ for (int i = 0; i < MAX_BOMBS; i++)
+ if (bombs[i].st == BB_OFF) {
+ Bomb *b = &bombs[i];
+ memset(b, 0, sizeof *b);
+ float a = deg * (float)M_PI / 180;
+ b->st = BB_WAIT, b->x = x, b->y = y, b->vx = cosf(a) * 5.5f, b->vy = sinf(a) * 5.5f, b->t = 0.3f;
+ anim_play(&b->anim, CLIP_SPORG_IDLE_2);
+ return;
+ }
+}
+
+static void bomb_explode(Bomb *b) {
+ /* Explode: a Gas Explosion there (its collider on for 0.5 s, its flash fading in 1 s), a shake; the bomb gone */
+ b->st = BB_BOOM, b->t = 0, b->vx = b->vy = 0;
+ anim_play_from_frame(&b->lines, CLIP_FX_IMPACT_LINES, 0);
+ cam_shake(SHAKE_AVERAGE);
+}
+
+static void bombs_tick(void) {
+ for (int i = 0; i < MAX_BOMBS; i++) {
+ Bomb *b = &bombs[i];
+ if (b->st == BB_OFF) continue;
+ b->anim.events = 0, b->lines.events = 0;
+ anim_update(&b->anim, DT);
+ if (b->st == BB_BOOM) {
+ anim_update(&b->lines, DT);
+ if ((b->t += DT) >= 1.5f) b->st = BB_OFF; /* (Collider End: 1 s more, then Recycle) */
+ continue;
+ }
+ if (b->st == BB_CHASE) {
+ /* ChaseObjectV2: a force towards the Knight, the speed held to 5 */
+ float dx = hero_x() - b->x, dy = hero_y() - b->y, l = sqrtf(dx * dx + dy * dy);
+ if (l > 1) dx /= l, dy /= l;
+ float sp = sqrtf(b->vx * b->vx + b->vy * b->vy);
+ if (sp > 5) b->vx *= 5 / sp, b->vy *= 5 / sp;
+ b->vx += dx * 8 * DT, b->vy += dy * 8 * DT;
+ } else if (b->st == BB_READY)
+ b->vx *= 0.95f, b->vy *= 0.95f; /* (DecelerateV2) */
+ /* (ObjectBounce: off the terrain at its speed) */
+ float dx = b->vx * DT, dy = b->vy * DT;
+ if (dx != 0 && phys_ray(b->x, b->y, dx > 0 ? 1 : -1, 0, fabsf(dx) + BOMB_R, CF_SOLID, NULL)) b->vx = -b->vx, dx = 0;
+ if (dy != 0 && phys_ray(b->x, b->y, 0, dy > 0 ? 1 : -1, fabsf(dy) + BOMB_R, CF_SOLID, NULL)) b->vy = -b->vy, dy = 0;
+ b->x += dx, b->y += dy;
+ b->ang += b->vx * -50 * DT; /* (Rotate By Speed) */
+ if ((b->t -= DT) > 0) continue;
+ if (b->st == BB_WAIT) b->st = BB_CHASE, b->t = 2.9f;
+ else if (b->st == BB_CHASE) {
+ /* Ready: slowing, swelling */
+ b->st = BB_READY, b->t = 0.6f;
+ anim_play_from_frame(&b->anim, CLIP_SPORG_EXPLODE, 0);
+ } else
+ bomb_explode(b);
+ }
+}
+
+static int bombs_touch(float x0, float y0, float x1, float y1, int *side) {
+ for (int i = 0; i < MAX_BOMBS; i++) {
+ Bomb *b = &bombs[i];
+ if (b->st == BB_CHASE && x1 > b->x - BOMB_R && x0 < b->x + BOMB_R && y1 > b->y - BOMB_R && y0 < b->y + BOMB_R)
+ bomb_explode(b); /* (the HeroBox: COLLIDE) */
+ if (b->st != BB_BOOM || b->t >= 0.5f) continue;
+ /* (its circle, 3 across) */
+ float qx = b->x < x0 ? x0 : b->x > x1 ? x1 : b->x, qy = b->y < y0 ? y0 : b->y > y1 ? y1 : b->y;
+ if ((qx - b->x) * (qx - b->x) + (qy - b->y) * (qy - b->y) < 9) {
+ *side = b->x > (x0 + x1) / 2 ? SIDE_RIGHT : SIDE_LEFT;
+ return 2;
+ }
+ }
+ return 0;
+}
+
+static int bombs_nail(const float *pts, int npts) {
+ int out = 0;
+ for (int i = 0; i < MAX_BOMBS; i++) {
+ Bomb *b = &bombs[i];
+ if ((b->st == BB_WAIT || b->st == BB_CHASE) && box_meets_shape(b->x - BOMB_R, b->y - BOMB_R, b->x + BOMB_R, b->y + BOMB_R, pts, npts))
+ bomb_explode(b), out |= HB_RECOIL; /* (the Attack layer: COLLIDE) */
+ }
+ return out;
+}
+
+static void bombs_draw(void) {
+ for (int i = 0; i < MAX_BOMBS; i++) {
+ const Bomb *b = &bombs[i];
+ Inst in;
+ if (b->st == BB_BOOM) {
+ /* its orange flash fading out over a second, its twelve Impact Lines about it */
+ int al = (int)(255 * (1 - b->t)) & ~15;
+ if (al > 0) {
+ sprite_inst(SPRITE_GAS_FLASH, b->x, b->y, -0.01f, 1, 1, gfx_dyn_tint(12 + i % 4, 255, 255, 255, (uint8_t)al), &in);
+ gfx_actor_minor(&in, SORT_KEY(0, 0));
+ }
+ if (b->lines.playing && b->lines.sprite >= 0) {
+ static const int16_t deg[12] = {0, 30, 60, 91, 124, 156, 189, 215, 242, 278, 310, 340};
+ for (int k = 0; k < 12; k++) {
+ sprite_inst_rot(b->lines.sprite, b->x, b->y, -0.011f, 1, 1, deg[k], 0, &in);
+ gfx_actor_minor(&in, SORT_KEY(0, 0));
+ }
+ }
+ continue;
+ }
+ if (b->st == BB_OFF || b->anim.sprite < 0) continue;
+ sprite_inst_rot(b->anim.sprite, b->x, b->y, -0.004f, 1.5f, 1.5f, b->ang, 0, &in);
+ gfx_actor_minor(&in, SORT_KEY(0, 0));
+ }
+}
+
+/* ---------------------------------------------------------------- Sporgs (Shroom Turret): asleep in the wall till the
+ * Knight comes near; then every 3.5 to 4.25 s a Spore Bomb out the way they face, while he is about */
+enum { SG_DORMANT, SG_WAKE, SG_IDLE, SG_ANTIC, SG_FIRE, SG_AWAY };
+/* (b0: the Knight in its Hero Detect; wait: Idle's) */
+static void sporg_start(Enemy *e) {
+ e->st = SG_DORMANT, e->b0 = false;
+ e->flags |= 1; /* (its collider off) */
+ anim_play(&e->anim, CLIP(e, R_A3));
+}
+
+static void sporg_idle(Enemy *e, float t0, float t1) {
+ anim_play(&e->anim, CLIP(e, R_IDLE));
+ e->wait = rand_range(t0, t1), e->st = SG_IDLE;
+}
+
+/* the Knight in its Hero Detect: its box in its own axes, it turned as it is (its Fire Angle less 90) */
+static bool sporg_detect(const Enemy *e) {
+ const Ent *r = range_named(e, "Hero Detect"), *v = enemy_rec(e, ET_VARS);
+ if (!r || !v || g_hero.hidden) return false;
+ float a = (v->p0 - 90) * (float)M_PI / 180, c = cosf(a), s = sinf(a);
+ float dx = g_hero.body.x + g_hero.body.ox - e->body.x, dy = g_hero.body.y + g_hero.body.oy - e->body.y;
+ float lx = dx * c + dy * s, ly = -dx * s + dy * c;
+ return fabsf(lx - r->x0) < r->x1 + g_hero.body.hx && fabsf(ly - r->y0) < r->y1 + g_hero.body.hy;
+}
+
+static void sporg_update(Enemy *e) {
+ bool in = sporg_detect(e), enter = in && !e->b0, leave = !in && e->b0;
+ e->b0 = in;
+ bool done = (e->anim.events & ANIM_DONE) != 0;
+ if (leave) {
+ /* (HERO EXIT, from anywhere) Hero Away */
+ anim_play(&e->anim, CLIP(e, R_IDLE));
+ e->st = SG_AWAY;
+ return;
+ }
+ switch (e->st) {
+ case SG_DORMANT:
+ if (enter) {
+ /* Wake: Sleep to Idle, its collider on */
+ anim_play_from_frame(&e->anim, CLIP(e, R_A1), 0);
+ e->flags &= (uint8_t)~1;
+ e->st = SG_WAKE;
+ }
+ break;
+ case SG_WAKE:
+ if (done) sporg_idle(e, 0.5f, 0.5f); /* First Idle */
+ break;
+ case SG_AWAY:
+ if (enter) sporg_idle(e, 0.5f, 0.5f);
+ break;
+ case SG_IDLE:
+ if ((e->wait -= DT) <= 0) anim_play_from_frame(&e->anim, CLIP(e, R_A2), 0), e->st = SG_ANTIC; /* Attack Antic */
+ break;
+ case SG_ANTIC:
+ if (e->anim.events & ANIM_TRIGGER) {
+ /* Fire: a Spore Bomb from its Spawn Point, at its Fire Angle */
+ const Ent *v = enemy_rec(e, ET_VARS);
+ if (v) bomb_fire(e->body.x + v->p1, e->body.y + v->p2, v->p0);
+ e->st = SG_FIRE;
+ }
+ break;
+ case SG_FIRE:
+ if (done) sporg_idle(e, 3.5f, 4.25f);
+ break;
+ }
+}
+
/* ---------------------------------------------------------------- the kinds' hooks (enemy.c) */
static bool xl_wants_contacts(const Enemy *e) { return FSM(e) == EF_FUNGLING; }
static void xl_enter(void) {
memset(gas, 0, sizeof gas);
memset(globs, 0, sizeof globs);
+ memset(bombs, 0, sizeof bombs);
}
static void xl_tick(void) {
gas_tick();
globs_tick();
+ bombs_tick();
}
static void xl_draw(void) {
gas_draw();
globs_draw();
+ bombs_draw();
}
static int xl_touch(float x0, float y0, float x1, float y1, int *side) {
int d = gas_touch(x0, y0, x1, y1, side);
- return d ? d : globs_touch(x0, y0, x1, y1, side);
+ if (!d) d = globs_touch(x0, y0, x1, y1, side);
+ return d ? d : bombs_touch(x0, y0, x1, y1, side);
}
-static int xl_nail(const float *pts, int npts, float direction) { return ogres_nail(pts, npts, direction); }
+static int xl_nail(const float *pts, int npts, float direction) { return ogres_nail(pts, npts, direction) | bombs_nail(pts, npts); }
static void xl_draw_enemy(const Enemy *e, float z, uint8_t tint) {
if (FSM(e) == EF_FUNGOON && e->mode == EM_ALIVE) fungoon_draw(e, z, tint);
}
@@ -675,6 +866,7 @@ static void xl_start(Enemy *e, const Ent *d) {
else if (FSM(e) == EF_FUNGOON) fungoon_start(e);
else if (FSM(e) == EF_SHRUMELING) shrumeling_start(e);
else if (FSM(e) == EF_OGRE) ogre_start(e);
+ else if (FSM(e) == EF_SPORG) sporg_start(e);
}
static void xl_fixed(Enemy *e) {
@@ -683,6 +875,7 @@ static void xl_fixed(Enemy *e) {
else if (FSM(e) == EF_FUNGOON) fungoon_fixed(e);
else if (FSM(e) == EF_SHRUMELING) shrumeling_fixed(e);
else if (FSM(e) == EF_OGRE) ogre_fixed(e);
+ else if (FSM(e) == EF_SPORG) e->body.vx = e->body.vy = 0; /* (kinematic) */
}
static void xl_update(Enemy *e) {
@@ -691,4 +884,5 @@ static void xl_update(Enemy *e) {
else if (FSM(e) == EF_FUNGOON) fungoon_update(e);
else if (FSM(e) == EF_SHRUMELING) shrumeling_update(e);
else if (FSM(e) == EF_OGRE) ogre_update(e);
+ else if (FSM(e) == EF_SPORG) sporg_update(e);
}
diff --git a/games/hollowknight/tools/actors.py b/games/hollowknight/tools/actors.py
index 405eda9e..72372034 100644
--- a/games/hollowknight/tools/actors.py
+++ b/games/hollowknight/tools/actors.py
@@ -114,6 +114,9 @@ FW_KINDS = [
("ogre", "Shroom Brawler", ("sharedassets169.assets", 223), "OGRE",
{"IDLE": "Run", "TURN": "Turn", "A1": "Wake", "A2": "Spit", "A3": "Antic", "A4": "Smash Loop", "A5": "Smash to Run",
"A6": "Bounce", "A7": "Sleep", "DEATH_AIR": "Death Air"}),
+ # (Sporg; its Spore Bombs' clips are its library's: CLIP_SPORG_IDLE_2, CLIP_SPORG_EXPLODE)
+ ("sporg", "Shroom Turret", ("sharedassets167.assets", 154), "SPORG",
+ {"IDLE": "Idle 1", "A1": "Sleep to Idle", "A2": "Attack", "A3": "Sleep", "DEATH_AIR": "Death"}, ["Idle 2", "Explode"]),
]
if os.environ.get("HK_PART") == "2":
ENEMY_KINDS += FW_KINDS
@@ -193,7 +196,7 @@ ACTORS["bgate"] = ("sharedassets9.assets", 197, ["BG Opened", "BG Close 1", "BG
"Bone Gate Opened", "Bone Gate Close", "Bone Gate Closed", "Bone Gate Open"])
# lifeblood cocoons and their scuttlers (HealthCocoon, ScuttlerControl); effects (splats)
ACTORS["cocoon"] = ("sharedassets6.assets", 1092, ["Cocoon Idle", "Cocoon Sweat", "Scuttler Land", "Scuttler Run"])
-ACTORS["fx"] = ("resources.assets", 21298, ["Splat", "Splat2"])
+ACTORS["fx"] = ("resources.assets", 21298, ["Splat", "Splat2"] + (["Impact Lines"] if os.environ.get("HK_PART") == "2" else []))
# Vengeful Spirit (Fireball Top's blast, Fireball: its ball, its end, its impact on a wall)
ACTORS["fireball"] = ("resources.assets", 23262, ["Blast", "Ball", "Ball End", "Fireball Wall Impact"])
# water drips (WaterDrip)
diff --git a/games/hollowknight/tools/ents.py b/games/hollowknight/tools/ents.py
index a448aad5..07cdfcfb 100644
--- a/games/hollowknight/tools/ents.py
+++ b/games/hollowknight/tools/ents.py
@@ -44,11 +44,11 @@ ENEMY_VARS = {"Zombie Swipe": (["Lunge Speed", "Idle Time"], ["Coward"]),
"Zombie Leap": (["Idle Time"], []),
"Zombie Guard": (["Chase Distance", "Roam Distance"], ["Start Facing Left"])}
# enemies whose body is a trigger, whose body is only their frames' colliders, and other children that are ranges
-TRIGGER_BODIES = {"Pigeon"}
+TRIGGER_BODIES = {"Pigeon", "Shroom Turret"}
FRAME_BODIES = {"Plant Trap Control", "Mossy Control"}
RANGES = {"Moss Walker": ("Wake Range",), "Pigeon": ("Hero Range", "Enemy Range"), "Plant Trap Control": ("Detector",),
"Moss Knight Control": ("Wake Box",), "Mender Bug Ctrl": ("Hero Detect",), "Fungus Flyer": ("Attack R", "Attack L"),
- "Shroom Brawler": ("Smash Region",)}
+ "Shroom Brawler": ("Smash Region",), "Shroom Turret": ("Hero Detect",)}
# (an arena's enemies its Start wakes (1) and its Wave 2 (2): WAKE sent to each, by _arenas)
ARENA_WAKES = {}
# (enemies whose attacks start with their colliders off: those still kept, off)
@@ -589,6 +589,11 @@ def _enemy(o, by_id, persist, name, d=None, strings=None, owners=None):
wr = kid.get("Wake Region")
bits = (1 if (var.get("Facing Right") or [0, False])[1] else 0) | (2 if wr and wr["self_active"] else 0)
out.append(rec(ENT_BOX, ET_VARS, p=(sp[0], sp[1], ARENA_WAKES.get(o["id"], 0), 0), box=cbox, a=bits))
+ if fsm.get("name") == "Shroom Turret":
+ # (Sporg: its Fire Angle, its Spawn Point from it)
+ q = next((by_id[ch] for ch in o.get("children", []) if by_id[ch]["name"] == "Spawn Point"), None)
+ sp = (q["pos"][0] - o["pos"][0], q["pos"][1] - o["pos"][1]) if q else (0, 0)
+ out.append(rec(ENT_BOX, ET_VARS, p=(_angle(o) + 90, sp[0], sp[1], 0)))
if fsm.get("name") == "Big Fly Control" and d is not None:
# (Gruz Mother: where her young wait, Fly Spawn; her burster brings them there)
fs = next((q for q in d["objects"] if q["name"] == "Fly Spawn"), None)
diff --git a/games/hollowknight/tools/pack.py b/games/hollowknight/tools/pack.py
index c592b463..d6f0d5e5 100644
--- a/games/hollowknight/tools/pack.py
+++ b/games/hollowknight/tools/pack.py
@@ -520,6 +520,11 @@ def main():
if PART == 2:
# (the gas the Fungoons spit: their Gas Attack particles' texture, 4 units wide)
fleurs["SPRITE_GAS"] = SPRITES.tex("sharedassets128.assets", 7, 4.0)
+ # (a Spore Bomb's Gas Explosion: its orange flash)
+ pge = unity.prefab("resources.assets", 5660)
+ of = next(o for o in pge["objects"] if o["name"] == "orange flash")
+ fleurs["SPRITE_GAS_FLASH"] = SPRITES.id(pge, next(c["v"] for c in of["c"] if c["type"] == "SpriteRenderer")["m_Sprite"],
+ of["lscale"][0])
# (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)
diff --git a/games/hollowknight/tools/rooms_fw.txt b/games/hollowknight/tools/rooms_fw.txt
index 07b249d1..6a12987b 100644
--- a/games/hollowknight/tools/rooms_fw.txt
+++ b/games/hollowknight/tools/rooms_fw.txt
@@ -1,3 +1,4 @@
Crossroads_18
Fungus2_06
Fungus2_05
+Fungus2_04