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.
C calculatorcalculator-gamescasiochesscrossy-roaddrive-madfx-cg50gamesgeometry-dashgraphing-calculatorndlessnumworksnumworks-appsnumworks-calculatornumworks-gamenumworks-gamestetristi-84-plus-ceti-nspire
Hollow Knight: Fungal Wastes: the Shrumal Ogres and their fight
Mason3632eec9c01a87e
diff --git a/games/hollowknight/src/data_fw.bin b/games/hollowknight/src/data_fw.binindex 21d0e9c6..bac41584 100644Binary files a/games/hollowknight/src/data_fw.bin and b/games/hollowknight/src/data_fw.bin differdiff --git a/games/hollowknight/src/data_fw.h b/games/hollowknight/src/data_fw.hindex a994ecdd..d1fc33a8 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 2+#define NUM_ROOMS 3#define ROOM_BASE 38#define HK_PART_N 2#define CROSS_HOME_ROOM 0@@ -26,6 +26,7 @@#define PART_BASES {0, 38}#define ROOM_CROSSROADS_18 0#define ROOM_FUNGUS2_06 1+#define ROOM_FUNGUS2_05 2#define CLIP_KNIGHT_IDLE 0#define CLIP_KNIGHT_IDLE_HURT 1#define CLIP_KNIGHT_IDLE_WIND 2@@ -518,51 +519,63 @@#define CLIP_FUNGUSHUSK_IDLE 489#define CLIP_FUNGUSHUSK_TURN 490#define CLIP_FUNGUSHUSK_WALK 491-#define CLIP_BGATE_BG_OPENED 492-#define CLIP_BGATE_BG_CLOSE_1 493-#define CLIP_BGATE_BG_CLOSE_2 494-#define CLIP_BGATE_BG_OPEN 495-#define CLIP_BGATE_BG_CLOSED 496-#define CLIP_BGATE_BONE_GATE_OPENED 497-#define CLIP_BGATE_BONE_GATE_CLOSE 498-#define CLIP_BGATE_BONE_GATE_CLOSED 499-#define CLIP_BGATE_BONE_GATE_OPEN 500-#define CLIP_COCOON_COCOON_IDLE 501-#define CLIP_COCOON_COCOON_SWEAT 502-#define CLIP_COCOON_SCUTTLER_LAND 503-#define CLIP_COCOON_SCUTTLER_RUN 504-#define CLIP_FX_SPLAT 505-#define CLIP_FX_SPLAT2 506-#define CLIP_FIREBALL_BLAST 507-#define CLIP_FIREBALL_BALL 508-#define CLIP_FIREBALL_BALL_END 509-#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 510-#define CLIP_DRIP_IDLE 511-#define CLIP_DRIP_DRIP 512-#define CLIP_DRIP_FALL 513-#define CLIP_DRIP_IMPACT 514-#define CLIP_HORNETCS_IDLE 515-#define CLIP_HORNETCS_JUMP_FULL 516-#define CLIP_HORNETCS_THROW_SIDE_START 517-#define CLIP_HORNETCS_THROW_SIDE 518-#define CLIP_HORNETCS_HARPOON_SIDE 519-#define CLIP_HORNETCS_THREAD_1 520-#define CLIP_HORNETCS_POINT 521-#define CLIP_HORNETCS_EVADE_ANTIC 522-#define CLIP_HORNETCS_EVADE 523-#define CLIP_HORNETCS_SOFT_LAND 524-#define CLIP_HORNETCS_TURN 525-#define CLIP_HORNETCS_RUN 526-#define CLIP_BULLET_IDLE 527-#define CLIP_BULLET_IMPACT 528-#define CLIP_BULLET_SHOCKWAVE_SPURT 529-#define SPRITE_HERO_LIGHT 2162-#define SPRITE_DIALOGUE_BACKBOARD 2163-#define SPRITE_PROMPT_SHADOW 2164-#define SPRITE_CORPSE_NAIL 2165-#define SPRITE_FK_BARREL 2166-#define SPRITE_FK_STAFF 2167-#define SPRITE_DIGIT0 2407+#define CLIP_OGRE_ANTIC 492+#define CLIP_OGRE_BOUNCE 493+#define CLIP_OGRE_DEATH_AIR 494+#define CLIP_OGRE_RUN 495+#define CLIP_OGRE_SLEEP 496+#define CLIP_OGRE_SMASH_LOOP 497+#define CLIP_OGRE_SMASH_TO_RUN 498+#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 STYLE_DIALOGUE 0#define STYLE_PROMPT 1#define STYLE_TITLE_L 2@@ -616,8 +629,9 @@#define EK_FUNGOON 33#define EK_SHRUMELING 34#define EK_FUNGUSHUSK 35-#define NUM_KINDS 36-#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}}}+#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 TXT_PROMPT_LISTEN 0#define TXT_PROMPT_REST 1#define TXT_PROMPT_INSPECT 2@@ -819,21 +833,22 @@#define VMEV_FIRST_MAP_UP 44#define VMEV_FIRST_MAP_DOWN 45#define VMEV_FK_RAGE_COMPLETE 46-#define VMEV_UPDATE_SHAMAN {255, 255}-#define VMEV_SHOP_REGION_INACTIVE {255, 255}-#define VMEV_SHOP_REGION_ACTIVE {255, 255}-#define VMSTR_NPC_TITLE 7-#define VMSTR_VISITED 8-#define VMSTR_DISPLAY_RIGHT 9-#define VMSTR_HORNET_SAVER 10-#define VMSTR_ITEM 11-#define STR_ATTACK_RANGE 12-#define STR_EVADE_RANGE 13-#define STR_SPIT_RANGE 14-#define STR_WAKE_BOX 15-#define STR_SLASH_HITBOX 16-#define STR_SLASH2_HITBOX 17-#define STR_DOOR_STAGEXIT 18+#define VMEV_UPDATE_SHAMAN {255, 255, 255}+#define VMEV_SHOP_REGION_INACTIVE {255, 255, 255}+#define VMEV_SHOP_REGION_ACTIVE {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_SMASH_HITS 13#define TITLE_KINGSPASS 0#define TITLE_DIRTMOUTH 1#define TITLE_CROSSROADS 2@@ -862,35 +877,35 @@#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 2168+#define SPRITE_FLEUR_TOP 2218#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 2169+#define SPRITE_FLEUR_BOT 2219#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 2162-#define SPRITE_MSG_BG 2170-#define SPRITE_MSG_STOP 2171-#define SPRITE_MSG_FLEUR 2172-#define SPRITE_MSG_KEY 2173-#define SPRITE_MSG_ICON_FIREBALL 2174-#define SPRITE_MSG_ICON_DASH 2175-#define SPRITE_GRASS_BALL 2176-#define SPRITE_GAS 2177-#define SPRITE_SOUL_ORB 2178+#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 SOUL_ORB_SORT {13, 0}#define MSG_TABLE {{77, 78, 79, 80, 81, 82}, {83, 84, 85, 86, 87, 88}}-#define NOTICE_BACKBOARD {2179, 1.0000f, 0.6931f}-#define TUTE_FLEUR {2172, 1.0000f, 1.0000f}-#define TUTE_BACKBOARD {2180, 1.0000f, 0.9560f}-#define TUTE_IMAGE {2181, 1.0000f, 1.0000f}-#define TUTE_STOP {2171, 1.0000f, 1.0000f}-#define FOCUS_PROMPT_BG {2182, 0.0000f, -1.7900f, 1.0000f, 1.0000f}+#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 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, 2183, 2184, 2185, 2186, -1, 2187, 2188, 2189, -1, -1, -1, -1, -1, 2190, -1, -1, -1, 2191, 2192, 2193, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#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_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@@ -898,38 +913,38 @@#define TXT_YN_YES 107#define TXT_YN_NO 108#define TXT_YN_NOT_ENOUGH 109-#define MENU_LOGO {2194, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_LOGO {2244, 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 {2195, 0.0000f, 0.0000f, 1.0023f, 1.0000f}+#define MENU_POINTER {2245, 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 {2196, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_PROFILES_FLEUR {2246, 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, {2197, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2198, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2199, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2200, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {9, {2201, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2202, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {24, {2203, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {35, {2204, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}+#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_NZONES 8#define MENU_SLOT_BG_DY 0.0102f-#define MENU_SLOT_FLEUR {2205, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_FLEUR {2255, 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 {2206, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_SELECTOR {2256, 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 {2207, 0.0000f, 0.0000f, 1.0000f, 1.0025f}+#define MENU_SLOT_CURSOR {2257, 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 {2208, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_ORB {2258, 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 {2209, 0.0000f, 0.0000f, 1.0039f, 1.0000f}+#define MENU_SLOT_GEO {2259, 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 {2210, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_HEALTH {2260, 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@@ -947,15 +962,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 {2211, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_TOP {2261, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_TOP_Y 2.3653f-#define MENU_PAUSE_BOT {2212, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_BOT {2262, 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 {2196, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_KEYS_FLEUR {2246, 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@@ -988,39 +1003,39 @@#define TXT_CROSS_NEW 162#define INV_X -4.0500f#define INV_Y 7.5500f-#define INV_BORDER {{2213, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2213, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2214, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2215, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2216, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2217, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}+#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_NBORDER 6-#define INV_FRAME {2218, 4.0479f, -7.1963f, 1.0f, 1.0f}-#define INV_ARROW_L {2219, -9.8300f, -7.2000f, 1.0000f, 1.0000f}-#define INV_ARROW_R {2219, 18.0300f, -7.2000f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_L {2220, -9.8600f, -0.4300f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_R {2220, 18.0400f, -0.4300f, 1.0000f, 1.0000f}+#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_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 {2221, -7.9200f, -8.3700f, 1.0000f, 1.0000f}+#define CH_BB {2271, -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 {2222, 0.0500f, 0.0600f, 1.0000f, 0.9919f}+#define CH_GLOW {2272, 0.0500f, 0.0600f, 1.0000f, 0.9919f}#define CH_GLOW_A 0.6970f-#define CH_ICONS {-1, 2183, 2184, 2185, 2186, -1, 2187, 2188, 2189, -1, -1, -1, -1, -1, 2190, -1, -1, -1, 2191, 2192, 2193, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define CH_NEXT_DOT {2223, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#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_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 {2224, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define CH_NOTCH_EMPTY {2225, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#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_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 {2226, -0.8400f, -6.9300f, 1.0000f, 0.1591f}+#define CH_DIVIDER {2276, -0.8400f, -6.9300f, 1.0000f, 0.1591f}#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}-#define CH_COST_PIP {2224, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_COST_PIP {2274, 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@@ -1029,9 +1044,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 {2227, 16.3208f, -13.2878f, 1.0f, 1.0f}+#define CH_CONFIRM_KEY {2277, 16.3208f, -13.2878f, 1.0f, 1.0f}#define CH_CONFIRM_KEY_W 0.6412f-#define CH_CURSOR {2228, 0.0000f, 0.0000f, 1.0000f, 0.9756f}+#define CH_CURSOR {2278, 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@@ -1046,23 +1061,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 {{2229, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2230, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2231, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2232, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2233, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2234, -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}, {2235, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2236, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}+#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_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 {{2237, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2238, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2239, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2240, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}-#define INV_VESSEL_PIECES {{2241, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2242, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2243, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}+#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_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 {{2244, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2245, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2246, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2247, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2248, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2249, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}+#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_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 {{2250, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2251, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2252, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2253, 7.4000f, -10.7800f, 1.0000f, 1.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_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 {2254, 4.2400f, -10.8700f, 1.0000f, 1.0000f}-#define INV_DIVIDERS {{2255, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2255, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}+#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_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}}@@ -1071,15 +1086,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 {2256, 4.9000f, -0.3200f, 0.8667f, 1.0000f}-#define SHOP_MASK_TOP {2257, 5.1230f, 4.8800f, 1.0000f, 0.9013f}-#define SHOP_MASK_BOTTOM {2258, 5.1537f, -5.6200f, 1.0000f, 0.8820f}-#define SHOP_ARROW_U {2259, 1.7000f, 1.8900f, 1.0000f, 1.0000f}-#define SHOP_ARROW_D {2259, 1.7000f, -0.3800f, -1.0000f, 1.0000f}-#define SHOP_SELECTOR {2260, 1.7300f, 0.7600f, 0.9332f, 1.0000f}-#define SHOP_CONFIRM_GEO {2261, 4.2800f, 0.3400f, 1.0000f, 1.0000f}-#define SHOP_POINTER_L {2262, 3.6119f, -2.0798f, 1.0000f, 1.0000f}-#define SHOP_POINTER_R {2262, 6.6249f, -2.0798f, -1.0000f, 1.0000f}+#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_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@@ -1099,7 +1114,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 {2263, 5.5100f, 2.5800f, 1.0000f, 1.0000f}+#define SHOP_PEG {2313, 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}@@ -1120,9 +1135,9 @@#define TXT_SHOP_YES 261#define TXT_SHOP_NO 262#define SHOP_DESC_BOTTOM -5.0500f-#define SHOP_ITEMS {{2265, 0.5714f, 263, 264, 150, 1, 125, -1, 0, 0}, {2265, 0.5714f, 263, 265, 500, 1, 126, 125, 0, 0}, {2266, 0.5714f, 266, 267, 550, 3, 127, -1, 0, 0}, {2267, 0.5714f, 268, 269, 950, 10, 128, -1, 0, 0}, {2268, 0.5714f, 270, 271, 300, 2, 37, -1, 0, 1}, {2269, 0.5714f, 272, 273, 200, 2, 40, -1, 0, 4}, {2270, 0.5714f, 274, 275, 1800, 0, 119, -1, 0, 0}, {2271, 0.5714f, 276, 277, 60, 11, 129, -1, 0, 0}, {2272, 0.5714f, 278, 279, 220, 2, 38, -1, 0, 2}, {2273, 0.5714f, 280, 281, 120, 0, 2, -1, 0, 0}, {2274, 0.5714f, 282, 283, 40, 9, 130, 10, 0, 0}, {2274, 0.5714f, 284, 285, 80, 9, 131, 28, 0, 0}, {2275, 0.5714f, 286, 287, 100, 16, 133, -1, 0, 0}, {2276, 0.5714f, 288, 289, 100, 16, 134, -1, 0, 0}, {2277, 0.5714f, 290, 291, 100, 16, 135, -1, 0, 0}, {2278, 0.5714f, 292, 293, 100, 16, 137, 147, 0, 0}, {2279, 0.5714f, 294, 295, 100, 16, 136, -1, 0, 0}, {2280, 0.5714f, 296, 297, 100, 17, 139, -1, 0, 0}, {2281, 0.5714f, 298, 299, 100, 17, 140, -1, 0, 0}, {2282, 0.5714f, 300, 301, 100, 17, 141, 14, 0, 0}, {2283, 0.5714f, 302, 303, 210, 17, 142, 14, 0, 0}, {2284, 0.5714f, 304, 305, 250, 2, 44, -1, 0, 8}, {2285, 0.5714f, 306, 307, 300, 2, 54, -1, 0, 18}, {2286, 0.5714f, 308, 309, 120, 2, 50, -1, 0, 14}, {2287, 0.5714f, 310, 311, 220, 2, 55, -1, 0, 19}, {2288, 0.5714f, 312, 313, 800, 2, 43, -1, 0, 7}, {2289, 0.5714f, 314, 315, 120, 8, 143, -1, 5, 0}, {2289, 0.5714f, 314, 315, 500, 8, 144, -1, 10, 0}, {2289, 0.5714f, 314, 315, 900, 8, 145, -1, 18, 0}, {2289, 0.5714f, 314, 316, 1400, 8, 146, -1, 25, 0}}+#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_FIRST {0, 8, 21, 30}-#define SHOP_ROW_GEO {2264, 1.4551f, 0.0000f, 1.0000f, 1.0000f}+#define SHOP_ROW_GEO {2314, 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}@@ -1137,21 +1152,21 @@#define COLLECT_MOVER_TO {-7.7000f, 6.0400f}#define STAG_AT {0.3000f, 0.3000f}#define STAG_K 1.2646f-#define STAG_BACKING {2290, -0.4427f, 0.0000f, 1.0000f, 0.6408f}+#define STAG_BACKING {2340, -0.4427f, 0.0000f, 1.0000f, 0.6408f}#define STAG_BACKING_A 0.9020f-#define STAG_PIECES {{2291, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2292, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2293, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {2294, 0.4147f, 1.5909f, 1.0000f, 1.0000f}}+#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_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 {2295, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define STAG_MAP_SHADOW {2296, 0.0110f, -0.0100f, 1.0000f, 0.9227f}+#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_T_ROW {-7.5992f, 4.9095f, 5.8145f}#define STAG_ROW_DY 1.0000f-#define STAG_POINTER_R {2297, 2.8680f, 0.6180f, -1.0000f, 1.0000f}-#define STAG_POINTER_L {2297, -2.8680f, 0.6180f, 1.0000f, 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_ROW {-7.5992f, 3.9576f}-#define STAG_LIST_KNIGHT {2295, -10.5102f, 4.6056f, 1.0000f, 1.0000f}-#define STAG_DIVIDER {2298, -7.6003f, 5.2734f, -1.0000f, -0.8696f}+#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_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}#define TXT_STAG_STATIONS 321#define TXT_STAG_NAMES {322, 282, 284}@@ -1167,52 +1182,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, 2299, 2300, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 255, 2306, 2307, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 127, 2309, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 2310, 2311, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 255, 2312, 2313, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 255, 2314, 2315, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 255, 2316, 2317, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 255, 2318, 2319, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2320, 2321, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 38, 2322, -1, -2.2000f, 3.7130f, 0.6600f, 0.7900f, 0xB5DDFB, 0}, {1, 255, 2323, 2324, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 255, 2325, 2326, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 2327, 2328, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2329, 2330, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2331, 2332, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 255, 2333, 2334, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 255, 2335, 2336, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 255, 2337, 2338, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 255, 2339, 2340, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2341, 2342, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 2343, 2344, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 255, 2345, 2346, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 255, 2347, 2348, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 2349, 2350, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 255, 2351, 2352, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 2353, 2354, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 255, 2355, 2356, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 2357, 2358, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 255, 2359, 2360, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 255, 2361, 2362, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 255, 2363, 2364, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 255, 2365, 2366, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}-#define MAP_PINS {{0, 0, 2301, -2.0390f, 7.7500f, 133, -1}, {0, 0, 2302, -1.6430f, 7.7500f, 137, -1}, {0, 0, 2303, -2.4700f, 7.7500f, 135, 122}, {0, 0, 2304, -1.2540f, 7.7600f, 135, 123}, {1, 1, 2308, -6.2100f, 7.6800f, 134, -1}, {21, 1, 2308, -10.9970f, 6.6240f, 134, -1}, {22, 0, 2301, -11.2580f, 4.9690f, 133, -1}, {30, 0, 2301, -7.6610f, 6.0700f, 133, -1}}-#define MAP_NEXT {{0, 2305, -1.0730f, 6.4850f, 180.0000f, 326, -1.0730f, 6.1870f, 1, -1}, {19, 2305, -1.0730f, 7.2500f, 0.0000f, 325, -1.0930f, 7.9120f, 1, -1}, {31, 2305, -4.5300f, 5.8450f, -90.0000f, 326, -4.1075f, 6.0470f, 0, 6}}+#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_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 {{2367, 0.0055f, -0.0110f, 178}, {2368, 0.0000f, 0.0000f, 255}}-#define MAP_MARKERS {2369, 2370, 2371, 2372}+#define MAP_SHADE {{2417, 0.0055f, -0.0110f, 178}, {2418, 0.0000f, 0.0000f, 255}}+#define MAP_MARKERS {2419, 2420, 2421, 2422}#define MAP_COMPASS_K 0.7000f#define MAP_BG_A 0.4438f#define MAP_TITLE {0.0000f, 7.5363f}-#define MAP_TITLE_BACK {2373, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}-#define MAP_NO_MAP {2374, 0.0000f, 0.9400f}+#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_NO_MAP_MSG {331, -0.0600f, -1.2932f}-#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 332, 2375, 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, 2425, 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 {{2376, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {2377, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {2378, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}+#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_KEY {336, 0.0900f, -2.3200f}-#define MAP_WIDE {{{2379, 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}}, {{2380, 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}}, {{2381, -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 {{{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_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 {{2382, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {2382, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {2382, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {2382, 17.1900f, -7.1700f, 1.0f, -90.0000f}}-#define MAP_ACT_CONFIRM {{2383, 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 {{2383, -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 {{2383, 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 {{2383, -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 {{2383, 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 {2384, 13.6200f, 3.4200f, 0.3781f, 1.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_KEY_STEP -0.8250f-#define MAP_KEY_ROWS {{{2385, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 349, {12.7550f, -1.5413f, 15.3500f}}, {{2386, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 350, {12.7550f, -1.5413f, 15.3500f}}, {{2387, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 351, {12.7550f, -1.5413f, 15.3500f}}, {{2388, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 352, {12.7550f, -1.5413f, 15.3500f}}, {{2389, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 353, {12.7550f, -1.5413f, 15.3500f}}}+#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_FLAGS {133, 134, 135, 136, 137}#define MAP_KEY_N 5-#define MAP_MM_PIECES {{2390, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {2391, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {2392, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {2393, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}-#define MAP_MM_MARKERS {2394, 2395, 2396, 2397}+#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_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 {2398, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}+#define MAP_MM_PLACE {2448, 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}+#define ROOM_ZONES {5, 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.cindex 9f19713b..79452b06 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_FUNGLING, EF_FUNGOON, EF_AMBLOOM, EF_SHRUMELING, EF_OGRE};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 {@@ -6873,6 +6873,9 @@ static void grass_balls_hit(float x0, float y0, float x1, float y1) {int enemies_nail(const float *pts, int npts, float direction, int damage) {int out = mossknights_nail(pts, npts);+#ifdef HK_FW+ out |= xl_nail(pts, npts, direction);+#endifif (hornet()) out |= hornet_nail(pts, npts, direction);float bx0, by0, bx1, by1;shape_bounds(pts, npts, &bx0, &by0, &bx1, &by1);diff --git a/games/hollowknight/src/enemy_fw.c b/games/hollowknight/src/enemy_fw.cindex 5aa7a75c..d96b37f3 100644--- a/games/hollowknight/src/enemy_fw.c+++ b/games/hollowknight/src/enemy_fw.c@@ -332,12 +332,332 @@ static void shrumeling_update(Enemy *e) {}}+/* ---------------------------------------------------------------- globs (Vomit Glob): flung, falling; landed, a puddle+ * that hurts for a while, then shrinks away */+#define MAX_GLOBS 12+enum { GL_OFF, GL_AIR, GL_LANDED, GL_SHRINK };+typedef struct {+ uint8_t st;+ float x, y, vx, vy, scale, t;+ Anim anim;+} Glob;+static Glob globs[MAX_GLOBS];++static void glob_fling(float x, float y, float vx, float vy) {+ for (int i = 0; i < MAX_GLOBS; i++)+ if (globs[i].st == GL_OFF) {+ Glob *g = &globs[i];+ memset(g, 0, sizeof *g);+ /* Init: a scale of its own; Idle */+ g->st = GL_AIR, g->x = x, g->y = y, g->vx = vx, g->vy = vy, g->scale = rand_range(1, 1.75f);+ anim_play(&g->anim, CLIP_GLOB_IDLE);+ return;+ }+}++static void globs_tick(void) {+ for (int i = 0; i < MAX_GLOBS; i++) {+ Glob *g = &globs[i];+ if (g->st == GL_OFF) continue;+ g->anim.events = 0;+ anim_update(&g->anim, DT);+ if (g->st == GL_AIR) {+ g->vy += -60 * 0.7f * DT; /* (its Rigidbody2D's gravity) */+ float hx = 0.295f * g->scale, hy = 0.305f * g->scale, cy = g->y + 0.37f * g->scale, dx = g->vx * DT, dy = g->vy * DT;+ PhysHit h;+ if (dx != 0 && phys_ray(g->x, cy, dx > 0 ? 1 : -1, 0, fabsf(dx) + hx, CF_SOLID, &h)) g->vx = 0, dx = 0; /* (a wall) */+ if (dy < 0 && phys_ray(g->x, cy, 0, -1, -dy + hy, CF_SOLID, &h)) {+ /* Land: still, a little up; Land; its puddle hurting, for 1.25 to 1.75 s */+ g->y = h.y - (0.37f * g->scale - hy) + 0.25f;+ g->x += dx;+ g->st = GL_LANDED, g->t = rand_range(1.25f, 1.75f);+ anim_play_from_frame(&g->anim, CLIP_GLOB_LAND, 0);+ continue;+ }+ g->x += dx, g->y += dy;+ if (g->y < -10) g->st = GL_OFF;+ } else if (g->st == GL_LANDED) {+ if ((g->t -= DT) <= 0) g->st = GL_SHRINK, g->t = 0;+ } else if ((g->t += DT) >= 0.25f + 1)+ g->st = GL_OFF; /* (Shrink: to a tenth in 0.25 s; Stop Steam: hidden, 1 s; Recycle) */+ }+}++static int globs_touch(float x0, float y0, float x1, float y1, int *side) {+ for (int i = 0; i < MAX_GLOBS; i++) {+ const Glob *g = &globs[i];+ float cx, cy, hx, hy;+ if (g->st == GL_AIR) cx = g->x, cy = g->y + 0.37f * g->scale, hx = 0.295f * g->scale, hy = 0.305f * g->scale;+ else if (g->st == GL_LANDED) /* (its Puddle Box) */+ cx = g->x - 0.0107f * g->scale, cy = g->y + 0.09f * g->scale, hx = 0.6387f * g->scale, hy = 0.132f * g->scale;+ else+ continue;+ if (x1 > cx - hx && x0 < cx + hx && y1 > cy - hy && y0 < cy + hy) {+ *side = g->x > (x0 + x1) / 2 ? SIDE_RIGHT : SIDE_LEFT;+ return 1;+ }+ }+ return 0;+}++static void globs_draw(void) {+ for (int i = 0; i < MAX_GLOBS; i++) {+ const Glob *g = &globs[i];+ if (g->st == GL_OFF || g->anim.sprite < 0) continue;+ float k = g->scale;+ if (g->st == GL_SHRINK) {+ if (g->t >= 0.25f) continue;+ k *= 1 - 0.9f * (g->t / 0.25f);+ }+ Inst in;+ sprite_inst(g->anim.sprite, g->x, g->y, -0.004f, k, k, 0, &in);+ gfx_actor_minor(&in, SORT_KEY(0, 0));+ }+}++/* ---------------------------------------------------------------- Shrumal Ogres (Shroom Brawler): asleep till woken+ * (by their Wake Region, or by their arena), they roam about where they started, turning to face the Knight; every+ * second and a half or so they spit globs at him or, if he is near, smash the ground before them. Their cap blocks+ * the nail; awake, they are only hurt from the sides till they first attack, then only as they attack */+enum { OG_SLEEP, OG_WAKE, OG_IDLE, OG_TURN, OG_SPIT_ANTIC, OG_SPIT, OG_SPIT_CD, OG_BOUNCE, OG_SMASH_ANTIC, OG_SMASHING,+ OG_SMASH_RECOVER };+#define OGF_RIGHT 1 /* (ET_VARS a: Facing Right; its Wake Region on) */+#define OGF_REGION 2+/* (b0: in its Wake Region; b1: Facing Right; ax, ay: Min X, Max X; qx: Move Speed; wait: Move Time's; t0: Wait Timer;+ * t1: Wait Time; c0: its cap on) */+static void ogre_set_speeds(Enemy *e, bool right) {+ e->b1 = right;+ set_scale_x(e, right ? -1 : 1);+}++static void ogre_start(Enemy *e) {+ const Ent *v = enemy_rec(e, ET_VARS);+ /* Init: Min X, Max X its Roam Distance (2) about it; Facing Right?; Sleep: its cap off, its collider off */+ e->ax = e->body.x - 2, e->ay = e->body.x + 2;+ ogre_set_speeds(e, v && (v->a & OGF_RIGHT));+ e->st = OG_SLEEP, e->c0 = 0, e->b0 = false;+ e->flags |= 1;+ anim_play(&e->anim, CLIP(e, R_A7));+}++static void ogre_wake(Enemy *e) {+ /* Wake: its collider and cap on, falling; invincible from above; Wake */+ e->flags &= (uint8_t)~1;+ e->c0 = 1;+ e->body.gravity_scale = 1;+ e->flags |= 4, e->inv_dir = 4;+ anim_play_from_frame(&e->anim, CLIP(e, R_A1), 0);+ e->st = OG_WAKE;+}++static void ogre_set_wait(Enemy *e) {+ e->t1 = rand_range(1.5f, 1.75f), e->t0 = 0; /* Set Wait Time */+}++static void ogre_idle(Enemy *e) {+ /* Idle: Run, its Move Speed, for its Move Time */+ anim_play(&e->anim, CLIP(e, R_IDLE));+ e->body.vx = e->qx;+ e->st = OG_IDLE;+}++static void ogre_change_movement(Enemy *e) {+ /* Change Movement: a Move Time, a Move Speed; RIGHT: on at once; else the other way, a new wait */+ e->wait = rand_range(1, 2), e->qx = rand_range(1, 3);+ if (rand_range(0, 1) >= 0.5f) {+ e->qx = -e->qx;+ ogre_set_wait(e);+ }+ ogre_idle(e);+}++static void ogre_invincible(Enemy *e, bool on) {+ /* (SetInvincible: from every way; SetCollider of its Cap Hit with it) */+ if (on) e->flags |= 4, e->inv_dir = 0, e->c0 = 1;+ else e->flags &= (uint8_t)~4, e->c0 = 0;+}++static void ogre_fixed(Enemy *e) {+ if (e->st == OG_SLEEP) e->body.vx = e->body.vy = 0;+ else if (e->st == OG_SMASHING) e->body.vx = e->b1 ? 0.85f : -0.85f; /* (Smash Speed, every frame) */+}++static void ogre_update(Enemy *e) {+ const Ent *v = enemy_rec(e, ET_VARS);+ bool done = (e->anim.events & ANIM_DONE) != 0, blocked = (e->rc_flags & RF_BLOCKED) != 0;+ if (e->st == OG_SLEEP) {+ if (v && (v->a & OGF_REGION) && wake_region(e) > 0) ogre_wake(e);+ return;+ }+ bool hero_left = hero_x() < e->body.x;+ switch (e->st) {+ case OG_WAKE:+ if (done) ogre_change_movement(e);+ break;+ case OG_IDLE:+ if (blocked) {+ anim_play_from_frame(&e->anim, CLIP(e, R_A6), 0), e->st = OG_BOUNCE; /* Bounce */+ break;+ }+ if ((e->wait -= DT) <= 0) {+ ogre_change_movement(e); /* (CHANGE DIR) */+ break;+ }+ if (e->body.x > e->ay) {+ /* Return Left, Right: back the other way */+ e->wait = rand_range(1, 2), e->qx = -rand_range(1, 3);+ ogre_idle(e);+ break;+ }+ if (e->body.x < e->ax) {+ e->wait = rand_range(1, 2), e->qx = rand_range(1, 3);+ ogre_idle(e);+ break;+ }+ if (e->b1 == hero_left) {+ /* Turn L, R: to the Knight */+ ogre_set_speeds(e, !hero_left);+ anim_play_from_frame(&e->anim, CLIP(e, R_TURN), 0);+ e->st = OG_TURN;+ break;+ }+ if ((e->t0 += DT) > e->t1) {+ /* Spit Antic: too far, given up; near, Smash Antic; else still, open to the nail, Spit */+ e->t1 = rand_range(1.25f, 1.5f);+ float dx = hero_x() - e->body.x, dy = hero_y() - e->body.y;+ if (dx * dx + dy * dy > 25 * 25) {+ ogre_set_wait(e);+ ogre_idle(e);+ } else if (hero_in_range(e, "Smash Region")) {+ anim_play_from_frame(&e->anim, CLIP(e, R_A3), 0);+ e->body.vx = 0;+ e->st = OG_SMASH_ANTIC;+ } else {+ ogre_invincible(e, false);+ e->body.vx = 0;+ anim_play_from_frame(&e->anim, CLIP(e, R_A2), 0);+ e->t0 = 0;+ e->st = OG_SPIT_ANTIC;+ }+ }+ break;+ case OG_TURN:+ e->t0 += DT;+ if (blocked) anim_play_from_frame(&e->anim, CLIP(e, R_A6), 0), e->st = OG_BOUNCE;+ else if (done) ogre_idle(e);+ break;+ case OG_SPIT_ANTIC:+ if (e->anim.events & ANIM_TRIGGER) {+ /* Spit: invincible again; 2 to 4 globs at the Knight, up */+ ogre_invincible(e, true);+ float t = (hero_x() - e->body.x) * 0.8f, lo = e->b1 ? 2.5f : -13, hi = e->b1 ? 13 : -2.5f;+ t = t < lo ? lo : t > hi ? hi : t;+ float x, y;+ enemy_at(e, v ? v->p0 : -1.95f, v ? v->p1 : 0.04f, &x, &y);+ for (int n = (int)rand_range(2, 4.999f); n > 0; n--) glob_fling(x, y, rand_range(t - 1.5f, t + 1.5f), rand_range(23, 26));+ e->st = OG_SPIT;+ }+ break;+ case OG_SPIT:+ if (blocked) anim_play_from_frame(&e->anim, CLIP(e, R_A6), 0), e->st = OG_BOUNCE;+ else if (done) anim_play(&e->anim, CLIP(e, R_IDLE)), e->wait = 1, e->st = OG_SPIT_CD; /* Spit CD */+ break;+ case OG_SPIT_CD:+ if (blocked) anim_play_from_frame(&e->anim, CLIP(e, R_A6), 0), e->st = OG_BOUNCE;+ else if ((e->wait -= DT) <= 0) {+ e->wait = 0; /* (Idle's Move Time: the last, run out) */+ ogre_idle(e);+ }+ break;+ case OG_BOUNCE:+ if (done) ogre_idle(e);+ break;+ case OG_SMASH_ANTIC:+ if (done) {+ /* Smashing: its Smash Hits on, slowly forward, open to the nail, for 2.25 s or till the Knight is behind */+ mk_hitbox(e, STR_SMASH_HITS, true);+ anim_play_from_frame(&e->anim, CLIP(e, R_A4), 0);+ ogre_invincible(e, false);+ e->wait = 2.25f;+ e->st = OG_SMASHING;+ }+ break;+ case OG_SMASHING:+ if ((e->wait -= DT) <= 0 || e->b1 == hero_left) {+ /* Smash Recover */+ mk_hitbox(e, STR_SMASH_HITS, false);+ ogre_invincible(e, true);+ anim_play_from_frame(&e->anim, CLIP(e, R_A5), 0);+ e->body.vx = 0;+ e->st = OG_SMASH_RECOVER;+ }+ break;+ case OG_SMASH_RECOVER:+ if (done) ogre_idle(e);+ break;+ }+}++/* its Cap Hit: the nail meeting it blocked, the Knight bounced off it */+static int ogres_nail(const float *pts, int npts, float direction) {+ int out = 0;+ for (int i = 0; i < MAX_ENEMIES; i++) {+ Enemy *e = &en[i];+ if (e->mode != EM_ALIVE || FSM(e) != EF_OGRE || !e->c0) continue;+ const Ent *v = enemy_rec(e, ET_VARS);+ if (!v || v->x1 <= 0) continue;+ float cx, cy;+ enemy_at(e, v->x0, v->y0, &cx, &cy);+ if (!box_meets_shape(cx - v->x1, cy - v->y1, cx + v->x1, cy + v->y1, pts, npts)) continue;+ out |= HB_BOUNCE | HB_RECOIL;+ if (swing_bits >> i & 1) continue;+ swing_bits |= 1u << i;+ int dir = cardinal(direction);+ if (dir == 0) hero_recoil_left();+ else if (dir == 2) hero_recoil_right();+ FREEZE_MOMENT_1();+ }+ return out;+}++void enemies_wake(int wave) {+ for (int i = 0; i < MAX_ENEMIES; i++) {+ Enemy *e = &en[i];+ if (e->mode != EM_ALIVE || FSM(e) != EF_OGRE || e->st != OG_SLEEP) continue;+ const Ent *v = enemy_rec(e, ET_VARS);+ if (v && (int)v->p2 == wave) ogre_wake(e);+ }+}++int enemies_wave_hp(int wave) {+ for (int i = 0; i < MAX_ENEMIES; i++) {+ const Enemy *e = &en[i];+ if (e->mode != EM_ALIVE || FSM(e) != EF_OGRE) continue;+ const Ent *v = enemy_rec(e, ET_VARS);+ if (v && (int)v->p2 == wave) return e->hp;+ }+ return -1;+}+/* ---------------------------------------------------------------- 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); }-static void xl_tick(void) { gas_tick(); }-static void xl_draw(void) { gas_draw(); }-static int xl_touch(float x0, float y0, float x1, float y1, int *side) { return gas_touch(x0, y0, x1, y1, side); }+static void xl_enter(void) {+ memset(gas, 0, sizeof gas);+ memset(globs, 0, sizeof globs);+}+static void xl_tick(void) {+ gas_tick();+ globs_tick();+}+static void xl_draw(void) {+ gas_draw();+ globs_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);+}+static int xl_nail(const float *pts, int npts, float direction) { return ogres_nail(pts, npts, direction); }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);}@@ -354,6 +674,7 @@ static void xl_start(Enemy *e, const Ent *d) {else if (FSM(e) == EF_AMBLOOM) walker_init(e);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);}static void xl_fixed(Enemy *e) {@@ -361,6 +682,7 @@ static void xl_fixed(Enemy *e) {else if (FSM(e) == EF_AMBLOOM) ambloom_fixed(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);}static void xl_update(Enemy *e) {@@ -368,4 +690,5 @@ static void xl_update(Enemy *e) {else if (FSM(e) == EF_AMBLOOM) walker_update(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);}diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.hindex 4dd290e1..8baa0c89 100644--- a/games/hollowknight/src/game.h+++ b/games/hollowknight/src/game.h@@ -152,6 +152,10 @@ void arena_set_activated(void); /* Activated: its fight over (and saved) */bool arena_done(void);void enemies_summon(void); /* SUMMON: the summoners bring their enemies */void enemies_battle_start(void); /* BATTLE START */+#ifdef HK_FW+void enemies_wake(int wave); /* WAKE: an arena's enemies its wave wakes (ents.py: ARENA_WAKES) */+int enemies_wave_hp(int wave); /* (the HP of the first of them alive, else -1) */+#endifvoid enemies_hornet_wake(void); /* WAKE (to Hornet) */void enemies_hornet_saver(bool on); /* her Hornet Saver's walls (ActivateAllChildren) */enum { HB_BOUNCE = 1, HB_RECOIL = 2 }; /* a hit box (ENT_BOX's flags): a down slash bounces off it, a slash recoils */diff --git a/games/hollowknight/src/obj.c b/games/hollowknight/src/obj.cindex a6df6f0f..f42dce83 100644--- a/games/hollowknight/src/obj.c+++ b/games/hollowknight/src/obj.c@@ -482,7 +482,7 @@ void gates_event(int ev) {}/* ---------------------------------------------------------------- arenas (Battle Control; the False Knight's is enemy.c's) */-enum { ARF_TRIGGER = 1, ARF_DESTROY_GATES = 2, ARF_QUICK_OPEN = 4, ARF_WAVES = 8, ARF_NO_START = 16 };+enum { ARF_TRIGGER = 1, ARF_DESTROY_GATES = 2, ARF_QUICK_OPEN = 4, ARF_WAVES = 8, ARF_NO_START = 16, ARF_WAKE = 32 };enum { AR_DETECT, AR_FIGHT, AR_WAVE_PAUSE, AR_WAVE2, AR_END_WAIT, AR_DONE };static struct {int16_t ent; /* (-1: none) */@@ -526,9 +526,12 @@ void arena_start(void) {/* Start (Wave 1): BATTLE START, the gates shut, its camera lock on */arena.count = (int16_t)e->p2;enemies_battle_start();+#ifdef HK_FW+ if (e->a & ARF_WAKE) enemies_wake(1); /* (WAKE to its first) */+#endifgates_event(BG_CLOSE);if (e->p0 >= 0) ent_set_enabled((int)e->p0, true);- arena.st = AR_FIGHT;+ arena.st = AR_FIGHT, arena.t = 0;}void arena_enemy_died(void) {@@ -551,6 +554,18 @@ static void arena_tick(void) {}break;case AR_FIGHT:+#ifdef HK_FW+ if (e->a & ARF_WAKE) {+ /* (Start: CHECK, all down: End Wait; NEXT, down to so many, after so long or the first's HP low: Wave 2,+ * WAKE to the next) */+ int hp = enemies_wave_hp(1);+ arena.t += DT;+ if (arena.count <= 0) arena.st = AR_END_WAIT, arena.t = 0;+ else if (arena.count <= (int)e->s1 || (e->group && arena.t >= e->group) || (hp >= 0 && hp < e->group2))+ enemies_wake(2), arena.st = AR_WAVE2;+ break;+ }+#endifif ((e->a & ARF_WAVES) && arena.count <= (int)e->s1) arena.st = AR_WAVE_PAUSE, arena.t = 0;else if (!(e->a & ARF_WAVES) && arena.count <= 0) {if (e->a & ARF_NO_START) persist_set(e->persist); /* (Complete: Activated, the gates open after a while) */diff --git a/games/hollowknight/tools/actors.py b/games/hollowknight/tools/actors.pyindex 509c4ead..405eda9e 100644--- a/games/hollowknight/tools/actors.py+++ b/games/hollowknight/tools/actors.py@@ -110,6 +110,10 @@ FW_KINDS = [# (Fungified Husk: the Volatile Mosskin's FSM)("fungushusk", "Fungus Zombie Attack", ("sharedassets167.assets", 135), "SHAKER",{"IDLE": "Idle", "WALK": "Walk", "TURN": "Turn", "A1": "Attack"}),+ # (Shrumal Ogre; its Smash Hits plays Smash Loop: drawn as its own)+ ("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"}),]if os.environ.get("HK_PART") == "2":ENEMY_KINDS += FW_KINDS@@ -222,6 +226,9 @@ ACTORS["hornetcs"] = ("sharedassets19.assets", 91, ["Idle", "Jump Full", "Throw# enemies' shots (EnemyBullet)ACTORS["bullet"] = ("sharedassets32.assets", 745, ["Idle", "Impact", "Shockwave Spurt"])+if os.environ.get("HK_PART") == "2":+ # (the Shrumal Ogres' spit: Vomit Glob)+ ACTORS["glob"] = ("sharedassets34.assets", 1067, ["Idle", "Land"])# sprites of prefab objects the game draws itself: name -> (file, prefab, object, resolution)NAMED = {diff --git a/games/hollowknight/tools/ents.py b/games/hollowknight/tools/ents.pyindex aacb585d..a448aad5 100644--- a/games/hollowknight/tools/ents.py+++ b/games/hollowknight/tools/ents.py@@ -31,7 +31,7 @@ BGF_START_CLOSED, BGF_BONE, BGF_PD = 1, 2, 4# arenas (Battle Control, but the False Knight's: OK_ARENA's a): started by its trigger (else by an enemy), its# Activate destroys the gates (else opens them at once), two waves (the second summoned), or no start (counting from# the first)-ARF_TRIGGER, ARF_DESTROY_GATES, ARF_QUICK_OPEN, ARF_WAVES, ARF_NO_START = 1, 2, 4, 8, 16+ARF_TRIGGER, ARF_DESTROY_GATES, ARF_QUICK_OPEN, ARF_WAVES, ARF_NO_START, ARF_WAKE = 1, 2, 4, 8, 16, 32# enemies (an OK_ENEMY's a: src/enemy.c), by their FSM and animation libraryimport actors as _actors# enemies: by the FSM (or component) that runs them and their animation library -> their kind (actors.ENEMY_KINDS)@@ -47,7 +47,10 @@ ENEMY_VARS = {"Zombie Swipe": (["Lunge Speed", "Idle Time"], ["Coward"]),TRIGGER_BODIES = {"Pigeon"}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")}+ "Moss Knight Control": ("Wake Box",), "Mender Bug Ctrl": ("Hero Detect",), "Fungus Flyer": ("Attack R", "Attack L"),+ "Shroom Brawler": ("Smash Region",)}+# (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)HITBOXES_OFF = {"Moss Knight Control"}# what follows an enemy's record: ENT_BOX records, tagged@@ -575,6 +578,17 @@ def _enemy(o, by_id, persist, name, d=None, strings=None, owners=None):q = next((by_id[ch] for ch in o.get("children", []) if by_id[ch]["name"] == "Gas Hit Box"), None)if q:out.append(rec(ENT_BOX, ET_VARS, p=(q["lpos"][0] * abs(sx), q["lpos"][1] * abs(sy), q["lscale"][0], 0)))+ if fsm.get("name") == "Shroom Brawler":+ # (Shrumal Ogre: its Spit Point, which of its arena's waves wakes it (0: its Wake Region); its Cap Hit's box;+ # Facing Right, its Wake Region on)+ kid = {by_id[ch]["name"]: by_id[ch] for ch in o.get("children", [])}+ sp = kid.get("Spit Point", {}).get("lpos", [0, 0])+ cap = kid.get("Cap Hit")+ cb = next((c["v"] for c in cap["c"] if c["type"] == "BoxCollider2D" and c.get("v")), None) if cap else None+ cbox = (cb["m_Offset"]["x"], cb["m_Offset"]["y"], cb["m_Size"]["x"] / 2, cb["m_Size"]["y"] / 2) if cb else (0, 0, 0, 0)+ 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") == "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)@@ -699,6 +713,11 @@ def _props(d, o, by_id, rooms, strings, persist, sprites, owners, name):return None+def _ev(v):+ """An FSM action's event parameter -> its name"""+ return v[1] if isinstance(v, list) and len(v) > 1 else v++def _go_var(d, o, f, var, by_id):"""An FSM's GameObject variable -> the object's id (a reference, or what FindGameObject or FindChild sets it to),or None."""@@ -724,6 +743,7 @@ def _arenas(d, by_id):"""The arenas (Battle Control, but the False Knight's) -> (the objects their Activate destroys or hides, the enemiesthey count: SetBattleScene's, those their Detect hides: there only once the fight is over)."""gone, counted, later = set(), set(), set()+ ARENA_WAKES.clear()for o in d["objects"]:f = _fsm(o, ("Battle Control",)) if o["active"] else Noneif not f or "False Knight" in f["vars"]:@@ -749,11 +769,21 @@ def _arenas(d, by_id):later.add(q)for st in f["states"]:for a in st["actions"]:- if a["name"] == "SetBattleScene" and a.get("enabled", True):+ if not a.get("enabled", True):+ continue+ g = None+ if a["name"] == "SetBattleScene":g = _param(a, "target")- q = _go_var(d, o, f, g[1:], by_id) if isinstance(g, str) and g.startswith("$") else None+ elif a["name"] == "SetFsmGameObject" and _param(a, "variableName") == "Battle Scene":+ g = _param(a, "gameObject") # (health_manager_enemy's Battle Scene: the same)+ q = _go_var(d, o, f, g[1:], by_id) if isinstance(g, str) and g.startswith("$") else None+ if q is not None:+ counted.add(q)+ if a["name"] == "SendEventByName" and _param(a, "sendEvent") == "WAKE" and st["name"] in ("Start", "Wave 2"):+ t = (_param(a, "eventTarget") or {}).get("go")+ q = _go_var(d, o, f, t[1:], by_id) if isinstance(t, str) and t.startswith("$") else Noneif q is not None:- counted.add(q)+ ARENA_WAKES[q] = 1 if st["name"] == "Start" else 2return gone, counted, later@@ -952,6 +982,21 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0fl |= ARF_WAVESnext_at = next((_param(a, "integer2") for a in acts("Wave 1") if a["name"] == "IntCompare"), 0)pause = next((_param(a, "time") for a in acts("Wave Pause") if a["name"] == "Wait"), 0)+ hp_at, give_up = 0, 0+ if any(_param(a, "sendEvent") == "WAKE" for a in acts("Start") if a["name"] == "SendEventByName"):+ # (its Start wakes its first enemy, its Wave 2 the next: once Battle Enemies is down to so many, after so+ # long, or the first's HP below so much)+ fl |= ARF_WAKE+ for a in acts("Start"):+ ev = lambda k: _ev(_param(a, k))+ if a["name"] == "IntCompare" and ev("equal") == "NEXT" and _param(a, "integer1") == "$Battle Enemies":+ next_at = _param(a, "integer2") or 0+ elif a["name"] == "IntCompare" and ev("lessThan") == "NEXT":+ hp_at = _param(a, "integer2") or 0+ elif a["name"] == "Wait" and ev("finishEvent") == "NEXT":+ give_up = _param(a, "time") or 0+ # (Drop Item: its wait before End)+ wait += next((_param(a, "time") for a in acts("Drop Item") if a["name"] == "Wait"), 0)if _state(f, "Complete") and not _state(f, "Start"):# (no start: done once its count is down, the gates opening a while after)fl |= ARF_NO_START@@ -962,7 +1007,7 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0battles.append((len(recs), _go_var(d, o, f, "Camera Lock", by_id), None))recs.append(rec(ENT_OBJ, OK_ARENA, _trigger(o) or (0, 0, 0, 0), (-1, -1, count, wait), a=fl,persist=persist.id(name, o["path"]) if persistent else NO_PERSIST,- s0=int(round(pause * 100)), s1=int(next_at)))+ s0=int(round(pause * 100)), s1=int(next_at), group=int(give_up), group2=int(hp_at)))f = _fsm(o, ("summon",))if f and _go_var(d, o, f, "Buzzer", by_id) is not None:# a summoner: its place and way; the enemy it brings (fixed up below)diff --git a/games/hollowknight/tools/pack.py b/games/hollowknight/tools/pack.pyindex 17fa58a9..c592b463 100644--- a/games/hollowknight/tools/pack.py+++ b/games/hollowknight/tools/pack.py@@ -784,7 +784,7 @@ def main():secs["RVAR"].b += rvar# (the children enemy.c knows by name)str_ids = {n: STRINGS.id(n) for n in ("Attack Range", "Evade Range", "Spit Range", "Wake Box", "Slash Hitbox",- "Slash2 Hitbox", "door_stagExit")}+ "Slash2 Hitbox", "door_stagExit") + (("Smash Hits",) if PART == 2 else ())}secs["STR"].b += STRINGS.blob()secs["TEXT"].b += TEXTS.blob()secs["FONT"].b += TEXTS.fonts()diff --git a/games/hollowknight/tools/rooms_fw.txt b/games/hollowknight/tools/rooms_fw.txtindex b5e65865..07b249d1 100644--- a/games/hollowknight/tools/rooms_fw.txt+++ b/games/hollowknight/tools/rooms_fw.txt@@ -1,2 +1,3 @@Crossroads_18Fungus2_06+Fungus2_05