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: Fungoons and Shrumelings in the bigger build
Mason36369d685ae66bc
diff --git a/games/hollowknight/Makefile b/games/hollowknight/Makefileindex 15040831..48330a43 100644--- a/games/hollowknight/Makefile+++ b/games/hollowknight/Makefile@@ -20,7 +20,7 @@ BUILD_DIR = outputendifGAME = src/res.c src/tex.c src/room.c src/gfx.c src/phys.c src/anim.c src/hero.c src/camera.c src/game.c src/world.c src/obj.c src/enemy.c src/hud.c src/spell.c src/text.c src/npc.c src/title.c src/vm.c src/msg.c src/save.c src/death.c src/menu.c src/inv.c src/shop.c src/collect.c src/stag.c src/map.c src/lzma/LzmaDec.cSRC = $(GAME) src/plat_eadk.c src/main.c-HEADERS = $(wildcard src/*.h) ../common/epsilon_app.h ../common/epsilon_files.h+HEADERS = $(wildcard src/*.h) src/enemy_xl.c ../common/epsilon_app.h ../common/epsilon_files.hCFLAGS = -std=gnu11 $(shell $(NWLINK) eadk-cflags-device) -DEPSILON_XL=1 -DDATA_BIN='"$(DATA)"' $(XL_FLAGS)CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter -fno-math-errno -fsingle-precision-constantdiff --git a/games/hollowknight/src/data_xl.bin b/games/hollowknight/src/data_xl.binindex cf2186e5..306f8a3d 100644Binary files a/games/hollowknight/src/data_xl.bin and b/games/hollowknight/src/data_xl.bin differdiff --git a/games/hollowknight/src/data_xl.h b/games/hollowknight/src/data_xl.hindex 0a58c59f..329d2e32 100644--- a/games/hollowknight/src/data_xl.h+++ b/games/hollowknight/src/data_xl.h@@ -540,161 +540,178 @@#define CLIP_AMBLOOM_DEATH_LAND 473#define CLIP_AMBLOOM_TURN 474#define CLIP_AMBLOOM_WALK 475-#define CLIP_FUNGUSHUSK_ATTACK 476-#define CLIP_FUNGUSHUSK_DEATH_AIR 477-#define CLIP_FUNGUSHUSK_DEATH_LAND 478-#define CLIP_FUNGUSHUSK_IDLE 479-#define CLIP_FUNGUSHUSK_TURN 480-#define CLIP_FUNGUSHUSK_WALK 481-#define CLIP_BGATE_BG_CLOSE_1 482-#define CLIP_BGATE_BG_CLOSE_2 483-#define CLIP_BGATE_BG_CLOSED 484-#define CLIP_BGATE_BG_OPEN 485-#define CLIP_BGATE_BG_OPENED 486-#define CLIP_BGATE_BONE_GATE_CLOSE 487-#define CLIP_BGATE_BONE_GATE_CLOSED 488-#define CLIP_BGATE_BONE_GATE_OPEN 489-#define CLIP_BGATE_BONE_GATE_OPENED 490-#define CLIP_BGATE_GATE_IDLE 491-#define CLIP_BGATE_GATE_OPEN 492-#define CLIP_BGATE_GATE_OPENED 493-#define CLIP_BGATE_PILLAR_IDLE 494-#define CLIP_BGATE_PILLAR_OPENED 495-#define CLIP_BGATE_SWITCH_ACTIVATED 496-#define CLIP_BGATE_SWITCH_HIT 497-#define CLIP_BGATE_SWITCH_IDLE 498-#define CLIP_BGATE_TOLL_GATE_IDLE 499-#define CLIP_BGATE_TOLL_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_FX_SWORD 507-#define CLIP_FIREBALL_BLAST 508-#define CLIP_FIREBALL_BALL 509-#define CLIP_FIREBALL_BALL_END 510-#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 511-#define CLIP_DRIP_IDLE 512-#define CLIP_DRIP_DRIP 513-#define CLIP_DRIP_FALL 514-#define CLIP_DRIP_IMPACT 515-#define CLIP_HORNETCS_EVADE 516-#define CLIP_HORNETCS_EVADE_ANTIC 517-#define CLIP_HORNETCS_FALL 518-#define CLIP_HORNETCS_HARPOON_SIDE 519-#define CLIP_HORNETCS_IDLE 520-#define CLIP_HORNETCS_JUMP_FULL 521-#define CLIP_HORNETCS_POINT 522-#define CLIP_HORNETCS_RUN 523-#define CLIP_HORNETCS_SOFT_LAND 524-#define CLIP_HORNETCS_THREAD_1 525-#define CLIP_HORNETCS_THROW_SIDE 526-#define CLIP_HORNETCS_THROW_SIDE_START 527-#define CLIP_HORNETCS_TURN 528-#define CLIP_HORNETCS_TURNTOIDLE 529-#define CLIP_BULLET_IDLE 530-#define CLIP_BULLET_IMPACT 531-#define CLIP_BULLET_SHOCKWAVE_SPURT 532-#define CLIP_PROP0_WATERFALL_LOOP 533-#define CLIP_PROP1_TORCH2 534-#define CLIP_PROP1_TORCH3 535-#define CLIP_VM0_FLOWER 536-#define CLIP_VM0_IDLE 537-#define CLIP_VM0_REACH 538-#define CLIP_VM0_REACH_TO_IDLE 539-#define CLIP_VM0_TALK_LEFT 540-#define CLIP_VM0_TALK_RIGHT 541-#define CLIP_VM0_TURN_LEFT 542-#define CLIP_VM0_TURN_RIGHT 543-#define CLIP_VM2_IDLE 544-#define CLIP_VM2_LOOKLEFT 545-#define CLIP_VM2_LOOKRIGHT 546-#define CLIP_VM3_IDLE 547-#define CLIP_VM3_TALK 548-#define CLIP_VM3_TALK_END 549-#define CLIP_VM4_IDLE 550-#define CLIP_VM4_LOOKLEFT 551-#define CLIP_VM4_LOOKRIGHT 552-#define CLIP_VM4_SIT 553-#define CLIP_VM4_SIT_TALK 554-#define CLIP_VM4_SIT_TALK_END 555-#define CLIP_VM5_ARRIVE 556-#define CLIP_VM5_ARRIVE_SMOKE 557-#define CLIP_VM5_IDLE 558-#define CLIP_VM6_BELL_IDLE 559-#define CLIP_VM6_BELL_RING_R 560-#define CLIP_VM6_BELL_STAND 561-#define CLIP_VM6_BELL_STAND_APPEAR 562-#define CLIP_VM6_BOX_DISAPPEAR 563-#define CLIP_VM6_BOX_DISAPPEAR_QUICK 564-#define CLIP_VM6_BOX_IDLE 565-#define CLIP_VM6_FRONT 566-#define CLIP_VM6_GRATE_DISAPPEAR 567-#define CLIP_VM6_GRATE_IDLE 568-#define CLIP_VM8_DAZED 569-#define CLIP_VM8_IDLE 570-#define CLIP_VM8_TURN_L 571-#define CLIP_VM8_TURN_R 572-#define CLIP_VM8_WAKE 573-#define CLIP_VM11_HEGEMOL_CAST 574-#define CLIP_VM11_HEGEMOL_IDLE 575-#define CLIP_VM11_LURIEN_CAST 576-#define CLIP_VM11_LURIEN_IDLE 577-#define CLIP_VM11_MONOMON_CAST 578-#define CLIP_VM11_MONOMON_IDLE 579-#define CLIP_VM12_IDLE 580-#define CLIP_VM12_SIT_IDLE 581-#define CLIP_VM12_SIT_TALK 582-#define CLIP_VM12_SIT_TALK_END 583-#define CLIP_VM12_SUMMON 584-#define CLIP_VM12_TALK 585-#define CLIP_VM12_TALK_END 586-#define CLIP_VM12_TURN 587-#define CLIP_VM14_IDLE 588-#define CLIP_VM14_LOOK_LEFT 589-#define CLIP_VM14_LOOK_RIGHT 590-#define CLIP_VM14_TALK_CONVO_END 591-#define CLIP_VM14_TALK_CONVO_START 592-#define CLIP_VM14_TALK_SHOP_END 593-#define CLIP_VM14_TALK_SHOP_START 594-#define CLIP_VM15_IDLE 595-#define CLIP_VM15_SHOP_END 596-#define CLIP_VM15_SHOP_START 597-#define CLIP_VM15_TALK_END 598-#define CLIP_VM15_TALK_START 599-#define CLIP_VM16_CRY 600-#define CLIP_VM16_CRY_TURN 601-#define CLIP_VM16_FREED 602-#define CLIP_VM16_HOME_BOUNCE 603-#define CLIP_VM16_HOME_WAVE 604-#define CLIP_VM16_IDLE 605-#define CLIP_VM17_CRUMBLE 606-#define CLIP_VM17_IDLE 607-#define CLIP_VM18_BECKON 608-#define CLIP_VM18_CHEER 609-#define CLIP_VM18_CRY 610-#define CLIP_VM18_GIFT 611-#define CLIP_VM18_IDLE 612-#define CLIP_VM20_RIPPLE_WATER 613-#define CLIP_VM21_IDLE 614-#define CLIP_VM21_TALK_L 615-#define CLIP_VM21_TALK_L_END 616-#define CLIP_VM21_TALK_R 617-#define CLIP_VM21_TALK_R_END 618-#define CLIP_ANIM0_STAG_DOOR_OPEN00 619-#define CLIP_ANIM1_DASH_CLOAK_CORPSE000 620-#define CLIP_ANIM2_GROUND_PLINK_0 621-#define CLIP_ANIM3_FIREBALL_COLLECT_ANIM 622-#define CLIP_ANIM4_DOOR_OPEN00 623-#define SPRITE_HERO_LIGHT 2922-#define SPRITE_DIALOGUE_BACKBOARD 2923-#define SPRITE_PROMPT_SHADOW 2924-#define SPRITE_CORPSE_NAIL 2925-#define SPRITE_FK_BARREL 2926-#define SPRITE_FK_STAFF 2927-#define SPRITE_DIGIT0 3516+#define CLIP_FUNGOON_DEATH 476+#define CLIP_FUNGOON_EFFECT 477+#define CLIP_FUNGOON_FLOAT 478+#define CLIP_FUNGOON_SPIT 479+#define CLIP_FUNGOON_SPIT_ANTIC 480+#define CLIP_FUNGOON_SPIT_RECOVER 481+#define CLIP_SHRUMELING_DEATH_AIR 482+#define CLIP_SHRUMELING_DEATH_LAND 483+#define CLIP_SHRUMELING_IDLE 484+#define CLIP_SHRUMELING_MINI_REST_1 485+#define CLIP_SHRUMELING_MINI_REST_2 486+#define CLIP_SHRUMELING_MINI_REST_3 487+#define CLIP_SHRUMELING_MINI_REST_TO_WAKE_1 488+#define CLIP_SHRUMELING_MINI_REST_TO_WAKE_2 489+#define CLIP_SHRUMELING_MINI_REST_TO_WAKE_3 490+#define CLIP_SHRUMELING_RUN 491+#define CLIP_SHRUMELING_STARTLE 492+#define CLIP_FUNGUSHUSK_ATTACK 493+#define CLIP_FUNGUSHUSK_DEATH_AIR 494+#define CLIP_FUNGUSHUSK_DEATH_LAND 495+#define CLIP_FUNGUSHUSK_IDLE 496+#define CLIP_FUNGUSHUSK_TURN 497+#define CLIP_FUNGUSHUSK_WALK 498+#define CLIP_BGATE_BG_CLOSE_1 499+#define CLIP_BGATE_BG_CLOSE_2 500+#define CLIP_BGATE_BG_CLOSED 501+#define CLIP_BGATE_BG_OPEN 502+#define CLIP_BGATE_BG_OPENED 503+#define CLIP_BGATE_BONE_GATE_CLOSE 504+#define CLIP_BGATE_BONE_GATE_CLOSED 505+#define CLIP_BGATE_BONE_GATE_OPEN 506+#define CLIP_BGATE_BONE_GATE_OPENED 507+#define CLIP_BGATE_GATE_IDLE 508+#define CLIP_BGATE_GATE_OPEN 509+#define CLIP_BGATE_GATE_OPENED 510+#define CLIP_BGATE_PILLAR_IDLE 511+#define CLIP_BGATE_PILLAR_OPENED 512+#define CLIP_BGATE_SWITCH_ACTIVATED 513+#define CLIP_BGATE_SWITCH_HIT 514+#define CLIP_BGATE_SWITCH_IDLE 515+#define CLIP_BGATE_TOLL_GATE_IDLE 516+#define CLIP_BGATE_TOLL_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_SWORD 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_EVADE 533+#define CLIP_HORNETCS_EVADE_ANTIC 534+#define CLIP_HORNETCS_FALL 535+#define CLIP_HORNETCS_HARPOON_SIDE 536+#define CLIP_HORNETCS_IDLE 537+#define CLIP_HORNETCS_JUMP_FULL 538+#define CLIP_HORNETCS_POINT 539+#define CLIP_HORNETCS_RUN 540+#define CLIP_HORNETCS_SOFT_LAND 541+#define CLIP_HORNETCS_THREAD_1 542+#define CLIP_HORNETCS_THROW_SIDE 543+#define CLIP_HORNETCS_THROW_SIDE_START 544+#define CLIP_HORNETCS_TURN 545+#define CLIP_HORNETCS_TURNTOIDLE 546+#define CLIP_BULLET_IDLE 547+#define CLIP_BULLET_IMPACT 548+#define CLIP_BULLET_SHOCKWAVE_SPURT 549+#define CLIP_PROP0_WATERFALL_LOOP 550+#define CLIP_PROP1_TORCH2 551+#define CLIP_PROP1_TORCH3 552+#define CLIP_VM0_FLOWER 553+#define CLIP_VM0_IDLE 554+#define CLIP_VM0_REACH 555+#define CLIP_VM0_REACH_TO_IDLE 556+#define CLIP_VM0_TALK_LEFT 557+#define CLIP_VM0_TALK_RIGHT 558+#define CLIP_VM0_TURN_LEFT 559+#define CLIP_VM0_TURN_RIGHT 560+#define CLIP_VM2_IDLE 561+#define CLIP_VM2_LOOKLEFT 562+#define CLIP_VM2_LOOKRIGHT 563+#define CLIP_VM3_IDLE 564+#define CLIP_VM3_TALK 565+#define CLIP_VM3_TALK_END 566+#define CLIP_VM4_IDLE 567+#define CLIP_VM4_LOOKLEFT 568+#define CLIP_VM4_LOOKRIGHT 569+#define CLIP_VM4_SIT 570+#define CLIP_VM4_SIT_TALK 571+#define CLIP_VM4_SIT_TALK_END 572+#define CLIP_VM5_ARRIVE 573+#define CLIP_VM5_ARRIVE_SMOKE 574+#define CLIP_VM5_IDLE 575+#define CLIP_VM6_BELL_IDLE 576+#define CLIP_VM6_BELL_RING_R 577+#define CLIP_VM6_BELL_STAND 578+#define CLIP_VM6_BELL_STAND_APPEAR 579+#define CLIP_VM6_BOX_DISAPPEAR 580+#define CLIP_VM6_BOX_DISAPPEAR_QUICK 581+#define CLIP_VM6_BOX_IDLE 582+#define CLIP_VM6_FRONT 583+#define CLIP_VM6_GRATE_DISAPPEAR 584+#define CLIP_VM6_GRATE_IDLE 585+#define CLIP_VM8_DAZED 586+#define CLIP_VM8_IDLE 587+#define CLIP_VM8_TURN_L 588+#define CLIP_VM8_TURN_R 589+#define CLIP_VM8_WAKE 590+#define CLIP_VM11_HEGEMOL_CAST 591+#define CLIP_VM11_HEGEMOL_IDLE 592+#define CLIP_VM11_LURIEN_CAST 593+#define CLIP_VM11_LURIEN_IDLE 594+#define CLIP_VM11_MONOMON_CAST 595+#define CLIP_VM11_MONOMON_IDLE 596+#define CLIP_VM12_IDLE 597+#define CLIP_VM12_SIT_IDLE 598+#define CLIP_VM12_SIT_TALK 599+#define CLIP_VM12_SIT_TALK_END 600+#define CLIP_VM12_SUMMON 601+#define CLIP_VM12_TALK 602+#define CLIP_VM12_TALK_END 603+#define CLIP_VM12_TURN 604+#define CLIP_VM14_IDLE 605+#define CLIP_VM14_LOOK_LEFT 606+#define CLIP_VM14_LOOK_RIGHT 607+#define CLIP_VM14_TALK_CONVO_END 608+#define CLIP_VM14_TALK_CONVO_START 609+#define CLIP_VM14_TALK_SHOP_END 610+#define CLIP_VM14_TALK_SHOP_START 611+#define CLIP_VM15_IDLE 612+#define CLIP_VM15_SHOP_END 613+#define CLIP_VM15_SHOP_START 614+#define CLIP_VM15_TALK_END 615+#define CLIP_VM15_TALK_START 616+#define CLIP_VM16_CRY 617+#define CLIP_VM16_CRY_TURN 618+#define CLIP_VM16_FREED 619+#define CLIP_VM16_HOME_BOUNCE 620+#define CLIP_VM16_HOME_WAVE 621+#define CLIP_VM16_IDLE 622+#define CLIP_VM17_CRUMBLE 623+#define CLIP_VM17_IDLE 624+#define CLIP_VM18_BECKON 625+#define CLIP_VM18_CHEER 626+#define CLIP_VM18_CRY 627+#define CLIP_VM18_GIFT 628+#define CLIP_VM18_IDLE 629+#define CLIP_VM20_RIPPLE_WATER 630+#define CLIP_VM21_IDLE 631+#define CLIP_VM21_TALK_L 632+#define CLIP_VM21_TALK_L_END 633+#define CLIP_VM21_TALK_R 634+#define CLIP_VM21_TALK_R_END 635+#define CLIP_ANIM0_STAG_DOOR_OPEN00 636+#define CLIP_ANIM1_DASH_CLOAK_CORPSE000 637+#define CLIP_ANIM2_GROUND_PLINK_0 638+#define CLIP_ANIM3_FIREBALL_COLLECT_ANIM 639+#define CLIP_ANIM4_DOOR_OPEN00 640+#define SPRITE_HERO_LIGHT 2982+#define SPRITE_DIALOGUE_BACKBOARD 2983+#define SPRITE_PROMPT_SHADOW 2984+#define SPRITE_CORPSE_NAIL 2985+#define SPRITE_FK_BARREL 2986+#define SPRITE_FK_STAFF 2987+#define SPRITE_DIGIT0 3577#define STYLE_DIALOGUE 0#define STYLE_PROMPT 1#define STYLE_TITLE_L 2@@ -745,9 +762,11 @@#define EK_MENDER 30#define EK_FUNGLING 31#define EK_AMBLOOM 32-#define EK_FUNGUSHUSK 33-#define NUM_KINDS 34-#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 205, 204, -1, -1, -1, -1, -1, -1, -1, -1, 207, 208}}, {EF_BUZZER, {210, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 212, 213}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 220, 219, -1, -1, -1, -1, -1, -1, -1, 217, 218}}, {EF_BOUNCER, {-1, -1, -1, 223, -1, -1, -1, -1, -1, -1, -1, 221, 222}}, {EF_SPITTER, {-1, -1, -1, 226, 227, 225, -1, -1, -1, -1, -1, 224, -1}}, {EF_ROLLER, {230, -1, -1, 232, 231, 233, -1, -1, -1, -1, -1, 228, 229}}, {EF_BLOCKER, {240, -1, -1, 236, 241, 234, 235, 242, 243, 239, 238, -1, 237}}, {EF_HUSK, {249, 250, 251, 244, 246, 245, -1, -1, -1, -1, -1, 247, 248}}, {EF_HUSK, {257, 258, 259, 252, 254, 253, -1, -1, -1, -1, -1, 255, 256}}, {EF_HUSK, {265, 266, 267, 260, 262, 261, -1, -1, -1, -1, -1, 263, 264}}, {EF_HUSK, {273, 274, 275, 268, 270, 269, -1, -1, -1, -1, -1, 271, 272}}, {EF_LEAPER, {279, 281, 282, 276, 280, -1, -1, -1, -1, -1, -1, 277, 278}}, {EF_GUARD, {288, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 285, 286}}, {EF_FK, {310, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 308}}, {EF_FKHEAD, {330, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 328}}, {EF_HATCHER, {-1, -1, -1, 335, 334, -1, -1, -1, -1, -1, -1, 332, 333}}, {EF_HATCHLING, {-1, -1, -1, 336, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {342, -1, -1, 340, 341, 344, 343, 337, -1, -1, -1, 338, 339}}, {EF_GFLY, {357, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 366, 367, 365, 361, 362, -1, -1, -1, -1, -1, 363, 364}}, {EF_PIGEON, {-1, -1, -1, 369, 370, 371, 368, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {373, -1, -1, 376, 375, 374, -1, -1, -1, -1, -1, 372, -1}}, {EF_SHAKER, {380, 381, 382, 377, -1, -1, -1, -1, -1, -1, -1, 378, 379}}, {EF_MOSQUITO, {387, -1, -1, 389, 388, 384, 383, -1, -1, -1, -1, 385, 386}}, {EF_FATFLY, {393, -1, -1, 390, -1, -1, -1, -1, -1, -1, -1, 391, 392}}, {EF_MOSSCHARGER, {-1, -1, -1, 394, 395, 398, 401, 400, 402, 399, -1, 396, 397}}, {EF_MOSSKNIGHT, {408, 423, 427, -1, -1, -1, -1, -1, -1, -1, -1, 403, 404}}, {EF_HORNET, {443, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 431, -1}}, {EF_MENDER, {467, -1, -1, 468, 466, -1, -1, -1, -1, -1, -1, 464, 465}}, {EF_FUNGLING, {470, -1, -1, 471, -1, -1, -1, -1, -1, -1, -1, 469, -1}}, {EF_AMBLOOM, {-1, 474, 475, -1, -1, -1, -1, -1, -1, -1, -1, 472, 473}}, {EF_SHAKER, {479, 480, 481, 476, -1, -1, -1, -1, -1, -1, -1, 477, 478}}}+#define EK_FUNGOON 33+#define EK_SHRUMELING 34+#define EK_FUNGUSHUSK 35+#define NUM_KINDS 36+#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 205, 204, -1, -1, -1, -1, -1, -1, -1, -1, 207, 208}}, {EF_BUZZER, {210, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 212, 213}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 220, 219, -1, -1, -1, -1, -1, -1, -1, 217, 218}}, {EF_BOUNCER, {-1, -1, -1, 223, -1, -1, -1, -1, -1, -1, -1, 221, 222}}, {EF_SPITTER, {-1, -1, -1, 226, 227, 225, -1, -1, -1, -1, -1, 224, -1}}, {EF_ROLLER, {230, -1, -1, 232, 231, 233, -1, -1, -1, -1, -1, 228, 229}}, {EF_BLOCKER, {240, -1, -1, 236, 241, 234, 235, 242, 243, 239, 238, -1, 237}}, {EF_HUSK, {249, 250, 251, 244, 246, 245, -1, -1, -1, -1, -1, 247, 248}}, {EF_HUSK, {257, 258, 259, 252, 254, 253, -1, -1, -1, -1, -1, 255, 256}}, {EF_HUSK, {265, 266, 267, 260, 262, 261, -1, -1, -1, -1, -1, 263, 264}}, {EF_HUSK, {273, 274, 275, 268, 270, 269, -1, -1, -1, -1, -1, 271, 272}}, {EF_LEAPER, {279, 281, 282, 276, 280, -1, -1, -1, -1, -1, -1, 277, 278}}, {EF_GUARD, {288, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 285, 286}}, {EF_FK, {310, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 308}}, {EF_FKHEAD, {330, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 328}}, {EF_HATCHER, {-1, -1, -1, 335, 334, -1, -1, -1, -1, -1, -1, 332, 333}}, {EF_HATCHLING, {-1, -1, -1, 336, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {342, -1, -1, 340, 341, 344, 343, 337, -1, -1, -1, 338, 339}}, {EF_GFLY, {357, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 366, 367, 365, 361, 362, -1, -1, -1, -1, -1, 363, 364}}, {EF_PIGEON, {-1, -1, -1, 369, 370, 371, 368, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {373, -1, -1, 376, 375, 374, -1, -1, -1, -1, -1, 372, -1}}, {EF_SHAKER, {380, 381, 382, 377, -1, -1, -1, -1, -1, -1, -1, 378, 379}}, {EF_MOSQUITO, {387, -1, -1, 389, 388, 384, 383, -1, -1, -1, -1, 385, 386}}, {EF_FATFLY, {393, -1, -1, 390, -1, -1, -1, -1, -1, -1, -1, 391, 392}}, {EF_MOSSCHARGER, {-1, -1, -1, 394, 395, 398, 401, 400, 402, 399, -1, 396, 397}}, {EF_MOSSKNIGHT, {408, 423, 427, -1, -1, -1, -1, -1, -1, -1, -1, 403, 404}}, {EF_HORNET, {443, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 431, -1}}, {EF_MENDER, {467, -1, -1, 468, 466, -1, -1, -1, -1, -1, -1, 464, 465}}, {EF_FUNGLING, {470, -1, -1, 471, -1, -1, -1, -1, -1, -1, -1, 469, -1}}, {EF_AMBLOOM, {-1, 474, 475, -1, -1, -1, -1, -1, -1, -1, -1, 472, 473}}, {EF_FUNGOON, {478, -1, -1, 480, 479, 481, 477, -1, -1, -1, -1, 476, -1}}, {EF_SHRUMELING, {484, -1, -1, 492, 491, -1, -1, -1, -1, -1, -1, 482, 483}}, {EF_SHAKER, {496, 497, 498, 493, -1, -1, -1, -1, -1, -1, -1, 494, 495}}}#define TXT_PROMPT_LISTEN 108#define TXT_PROMPT_REST 109#define TXT_PROMPT_INSPECT 110@@ -992,34 +1011,35 @@#define TITLE_MAGE_TOWER 25#define NUM_TITLES 26#define TITLE_TABLE {{122, 123, -1, -1}, {124, 125, 126, -1}, {127, 128, -1, 129}, {130, 131, -1, 132}, {133, 134, -1, 135}, {136, 137, -1, -1}, {138, 139, 140, -1}, {141, 142, -1, -1}, {143, 144, -1, -1}, {145, 146, -1, -1}, {147, 148, -1, -1}, {149, 150, -1, -1}, {151, 152, -1, -1}, {153, 154, -1, -1}, {155, 156, -1, 157}, {158, 159, -1, 160}, {158, 159, -1, 161}, {162, 163, 164, -1}, {162, 163, -1, -1}, {165, 166, -1, 167}, {168, 169, -1, 170}, {171, 172, -1, 173}, {174, 175, -1, 176}, {177, 178, -1, 170}, {179, 180, -1, -1}, {181, 182, 183, -1}}-#define SPRITE_FLEUR_TOP 2928+#define SPRITE_FLEUR_TOP 2988#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 2929+#define SPRITE_FLEUR_BOT 2989#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 2908-#define SPRITE_MSG_BG 2930-#define SPRITE_MSG_STOP 2931-#define SPRITE_MSG_FLEUR 2932-#define SPRITE_MSG_KEY 2933-#define SPRITE_MSG_ICON_FIREBALL 2934-#define SPRITE_MSG_ICON_DASH 2935-#define SPRITE_GRASS_BALL 2936-#define SPRITE_SOUL_ORB 2937+#define VM_PIECE_BASE 2968+#define SPRITE_MSG_BG 2990+#define SPRITE_MSG_STOP 2991+#define SPRITE_MSG_FLEUR 2992+#define SPRITE_MSG_KEY 2993+#define SPRITE_MSG_ICON_FIREBALL 2994+#define SPRITE_MSG_ICON_DASH 2995+#define SPRITE_GRASS_BALL 2996+#define SPRITE_GAS 2997+#define SPRITE_SOUL_ORB 2998#define SOUL_ORB_SORT {13, 0}#define MSG_TABLE {{184, 185, 186, 187, 188, 189}, {190, 191, 192, 193, 194, 195}}-#define NOTICE_BACKBOARD {2938, 1.0000f, 0.6931f}-#define TUTE_FLEUR {2932, 1.0000f, 1.0000f}-#define TUTE_BACKBOARD {2939, 1.0000f, 0.9560f}-#define TUTE_IMAGE {2940, 1.0000f, 1.0000f}-#define TUTE_STOP {2931, 1.0000f, 1.0000f}-#define FOCUS_PROMPT_BG {2941, 0.0000f, -1.7900f, 1.0000f, 1.0000f}+#define NOTICE_BACKBOARD {2999, 1.0000f, 0.6931f}+#define TUTE_FLEUR {2992, 1.0000f, 1.0000f}+#define TUTE_BACKBOARD {3000, 1.0000f, 0.9560f}+#define TUTE_IMAGE {3001, 1.0000f, 1.0000f}+#define TUTE_STOP {2991, 1.0000f, 1.0000f}+#define FOCUS_PROMPT_BG {3002, 0.0000f, -1.7900f, 1.0000f, 1.0000f}#define FOCUS_PROMPT_TEXTS {{196, 0.1765f, -2.3773f, 0}, {197, 0.1765f, -3.1983f, 0}, {198, -0.0488f, -4.1348f, 1}, {199, 0.2240f, -5.2114f, 0}}#define FOCUS_PROMPT_KEY {189, 0.4659f, -4.4341f}-#define NOTICE_ICONS {2942, 2943, 2944, 2945}+#define NOTICE_ICONS {3003, 3004, 3005, 3006}#define CHARM_ICON_K 1.5000f-#define CHARM_ICONS {-1, 2946, 2947, 2948, 2949, -1, 2950, 2951, 2952, -1, -1, -1, -1, -1, 2953, -1, -1, -1, 2954, 2955, 2956, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CHARM_ICONS {-1, 3007, 3008, 3009, 3010, -1, 3011, 3012, 3013, -1, -1, -1, -1, -1, 3014, -1, -1, -1, 3015, 3016, 3017, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}#define CHARM_NAMES {-1, 200, 201, 202, 203, -1, 204, 205, 206, -1, -1, -1, -1, -1, 207, -1, -1, -1, 208, 209, 210, -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 211#define TXT_CHARM_TUTE_SUB 212@@ -1027,38 +1047,38 @@#define TXT_YN_YES 214#define TXT_YN_NO 215#define TXT_YN_NOT_ENOUGH 216-#define MENU_LOGO {2957, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_LOGO {3018, 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 {2958, 0.0000f, 0.0000f, 1.0023f, 1.0000f}+#define MENU_POINTER {3019, 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 {2959, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_PROFILES_FLEUR {3020, 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, {2960, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2961, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2962, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2963, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2964, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}+#define MENU_SLOT_ZONES {{2, {3021, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {3022, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {3023, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {3024, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {3025, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}#define MENU_SLOT_NZONES 5#define MENU_SLOT_BG_DY 0.0102f-#define MENU_SLOT_FLEUR {2965, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_FLEUR {3026, 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 {2966, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_SELECTOR {3027, 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 {2967, 0.0000f, 0.0000f, 1.0000f, 1.0025f}+#define MENU_SLOT_CURSOR {3028, 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 {2968, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_ORB {3029, 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 {2969, 0.0000f, 0.0000f, 1.0039f, 1.0000f}+#define MENU_SLOT_GEO {3030, 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 {2970, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_HEALTH {3031, 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@@ -1076,15 +1096,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 {2971, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_TOP {3032, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_TOP_Y 2.3653f-#define MENU_PAUSE_BOT {2972, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_BOT {3033, 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 {2959, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_KEYS_FLEUR {3020, 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@@ -1112,39 +1132,39 @@#define TXT_ZONES {257, 258, 259, 260, 261}#define INV_X -4.0500f#define INV_Y 7.5500f-#define INV_BORDER {{2973, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2973, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2974, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2975, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2976, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2977, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}+#define INV_BORDER {{3034, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {3034, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {3035, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {3036, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {3037, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {3038, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}#define INV_NBORDER 6-#define INV_FRAME {2978, 4.0479f, -7.1963f, 1.0f, 1.0f}-#define INV_ARROW_L {2979, -9.8300f, -7.2000f, 1.0000f, 1.0000f}-#define INV_ARROW_R {2979, 18.0300f, -7.2000f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_L {2980, -9.8600f, -0.4300f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_R {2980, 18.0400f, -0.4300f, 1.0000f, 1.0000f}+#define INV_FRAME {3039, 4.0479f, -7.1963f, 1.0f, 1.0f}+#define INV_ARROW_L {3040, -9.8300f, -7.2000f, 1.0000f, 1.0000f}+#define INV_ARROW_R {3040, 18.0300f, -7.2000f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_L {3041, -9.8600f, -0.4300f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_R {3041, 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 {264, 265, 266, 267}-#define CH_BB {2981, -7.9200f, -8.3700f, 1.0000f, 1.0000f}+#define CH_BB {3042, -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 {2982, 0.0500f, 0.0600f, 1.0000f, 0.9919f}+#define CH_GLOW {3043, 0.0500f, 0.0600f, 1.0000f, 0.9919f}#define CH_GLOW_A 0.6970f-#define CH_ICONS {-1, 2946, 2947, 2948, 2949, -1, 2950, 2951, 2952, -1, -1, -1, -1, -1, 2953, -1, -1, -1, 2954, 2955, 2956, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define CH_NEXT_DOT {2983, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_ICONS {-1, 3007, 3008, 3009, 3010, -1, 3011, 3012, 3013, -1, -1, -1, -1, -1, 3014, -1, -1, -1, 3015, 3016, 3017, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CH_NEXT_DOT {3044, 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 {2984, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define CH_NOTCH_EMPTY {2985, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_FULL {3045, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_EMPTY {3046, 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 {2986, -0.8400f, -6.9300f, 1.0000f, 0.1591f}+#define CH_DIVIDER {3047, -0.8400f, -6.9300f, 1.0000f, 0.1591f}#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}-#define CH_COST_PIP {2984, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_COST_PIP {3045, 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@@ -1153,9 +1173,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 {2987, 16.3208f, -13.2878f, 1.0f, 1.0f}+#define CH_CONFIRM_KEY {3048, 16.3208f, -13.2878f, 1.0f, 1.0f}#define CH_CONFIRM_KEY_W 0.6412f-#define CH_CURSOR {2988, 0.0000f, 0.0000f, 1.0000f, 0.9756f}+#define CH_CURSOR {3049, 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 268@@ -1170,23 +1190,23 @@#define TXT_CHARM_DESCS {-1, 287, 288, 289, 290, -1, 291, 292, 293, -1, -1, -1, -1, -1, 294, -1, -1, -1, 295, 296, 297, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}#define TXT_KEY_OK 298#define TXT_CHARM_BENCH 299-#define INV_FIXED {{2989, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2990, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2991, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2992, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2993, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2994, -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}, {2995, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2996, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}+#define INV_FIXED {{3050, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {3051, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {3052, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {3053, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {3054, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {3055, -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}, {3056, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {3057, -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 {{2997, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2998, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2999, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3000, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}-#define INV_VESSEL_PIECES {{3001, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {3002, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {3003, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}+#define INV_HEART_PIECES {{3058, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3059, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3060, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3061, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}+#define INV_VESSEL_PIECES {{3062, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {3063, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {3064, -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 {{3004, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3005, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3006, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3007, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3008, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3009, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}+#define INV_EQ {{3065, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3066, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3067, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3068, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3069, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3070, 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 {{3010, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {3011, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {3012, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {3013, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}+#define INV_TRINKETS {{3071, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {3072, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {3073, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {3074, 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 {3014, 4.2400f, -10.8700f, 1.0000f, 1.0000f}-#define INV_DIVIDERS {{3015, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {3015, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}+#define INV_TRINKET_BB {3075, 4.2400f, -10.8700f, 1.0000f, 1.0000f}+#define INV_DIVIDERS {{3076, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {3076, 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 {{300, 301}, {302, 303}, {304, 305}, {302, 306}, {302, 307}, {308, 309}}@@ -1195,15 +1215,15 @@#define TXT_INV_EQ {{325, 326}, {327, 328}, {329, 330}, {331, 332}, {333, 334}, {335, 336}}#define TXT_INV_QUILL {337, 338, 339, 340}#define TXT_INV_TRINKETS {{341, 342}, {343, 344}, {345, 346}, {347, 348}}-#define SHOP_BACKBOARD {3016, 4.9000f, -0.3200f, 0.8667f, 1.0000f}-#define SHOP_MASK_TOP {3017, 5.1230f, 4.8800f, 1.0000f, 0.9013f}-#define SHOP_MASK_BOTTOM {3018, 5.1537f, -5.6200f, 1.0000f, 0.8820f}-#define SHOP_ARROW_U {3019, 1.7000f, 1.8900f, 1.0000f, 1.0000f}-#define SHOP_ARROW_D {3019, 1.7000f, -0.3800f, -1.0000f, 1.0000f}-#define SHOP_SELECTOR {3020, 1.7300f, 0.7600f, 0.9332f, 1.0000f}-#define SHOP_CONFIRM_GEO {3021, 4.2800f, 0.3400f, 1.0000f, 1.0000f}-#define SHOP_POINTER_L {3022, 3.6119f, -2.0798f, 1.0000f, 1.0000f}-#define SHOP_POINTER_R {3022, 6.6249f, -2.0798f, -1.0000f, 1.0000f}+#define SHOP_BACKBOARD {3077, 4.9000f, -0.3200f, 0.8667f, 1.0000f}+#define SHOP_MASK_TOP {3078, 5.1230f, 4.8800f, 1.0000f, 0.9013f}+#define SHOP_MASK_BOTTOM {3079, 5.1537f, -5.6200f, 1.0000f, 0.8820f}+#define SHOP_ARROW_U {3080, 1.7000f, 1.8900f, 1.0000f, 1.0000f}+#define SHOP_ARROW_D {3080, 1.7000f, -0.3800f, -1.0000f, 1.0000f}+#define SHOP_SELECTOR {3081, 1.7300f, 0.7600f, 0.9332f, 1.0000f}+#define SHOP_CONFIRM_GEO {3082, 4.2800f, 0.3400f, 1.0000f, 1.0000f}+#define SHOP_POINTER_L {3083, 3.6119f, -2.0798f, 1.0000f, 1.0000f}+#define SHOP_POINTER_R {3083, 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 350@@ -1223,7 +1243,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 {3023, 5.5100f, 2.5800f, 1.0000f, 1.0000f}+#define SHOP_PEG {3084, 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}@@ -1244,9 +1264,9 @@#define TXT_SHOP_YES 360#define TXT_SHOP_NO 361#define SHOP_DESC_BOTTOM -5.0500f-#define SHOP_ITEMS {{3025, 0.5714f, 362, 363, 150, 1, 125, -1, 0, 0}, {3025, 0.5714f, 362, 364, 500, 1, 126, 125, 0, 0}, {3026, 0.5714f, 365, 366, 550, 3, 127, -1, 0, 0}, {3027, 0.5714f, 367, 368, 950, 10, 128, -1, 0, 0}, {3028, 0.5714f, 369, 370, 300, 2, 37, -1, 0, 1}, {3029, 0.5714f, 371, 372, 200, 2, 40, -1, 0, 4}, {3030, 0.5714f, 373, 374, 1800, 0, 119, -1, 0, 0}, {3031, 0.5714f, 375, 376, 60, 11, 129, -1, 0, 0}, {3032, 0.5714f, 377, 378, 220, 2, 38, -1, 0, 2}, {3033, 0.5714f, 379, 380, 120, 0, 2, -1, 0, 0}, {3034, 0.5714f, 381, 382, 40, 9, 130, 10, 0, 0}, {3034, 0.5714f, 383, 384, 80, 9, 131, 28, 0, 0}, {3035, 0.5714f, 385, 386, 100, 16, 133, -1, 0, 0}, {3036, 0.5714f, 387, 388, 100, 16, 134, -1, 0, 0}, {3037, 0.5714f, 389, 390, 100, 16, 135, -1, 0, 0}, {3038, 0.5714f, 391, 392, 100, 16, 137, 147, 0, 0}, {3039, 0.5714f, 393, 394, 100, 16, 136, -1, 0, 0}, {3040, 0.5714f, 395, 396, 100, 17, 139, -1, 0, 0}, {3041, 0.5714f, 397, 398, 100, 17, 140, -1, 0, 0}, {3042, 0.5714f, 399, 400, 100, 17, 141, 14, 0, 0}, {3043, 0.5714f, 401, 402, 210, 17, 142, 14, 0, 0}, {3044, 0.5714f, 403, 404, 250, 2, 44, -1, 0, 8}, {3045, 0.5714f, 405, 406, 300, 2, 54, -1, 0, 18}, {3046, 0.5714f, 407, 408, 120, 2, 50, -1, 0, 14}, {3047, 0.5714f, 409, 410, 220, 2, 55, -1, 0, 19}, {3048, 0.5714f, 411, 412, 800, 2, 43, -1, 0, 7}, {3049, 0.5714f, 413, 414, 120, 8, 143, -1, 5, 0}, {3049, 0.5714f, 413, 414, 500, 8, 144, -1, 10, 0}, {3049, 0.5714f, 413, 414, 900, 8, 145, -1, 18, 0}, {3049, 0.5714f, 413, 415, 1400, 8, 146, -1, 25, 0}}+#define SHOP_ITEMS {{3086, 0.5714f, 362, 363, 150, 1, 125, -1, 0, 0}, {3086, 0.5714f, 362, 364, 500, 1, 126, 125, 0, 0}, {3087, 0.5714f, 365, 366, 550, 3, 127, -1, 0, 0}, {3088, 0.5714f, 367, 368, 950, 10, 128, -1, 0, 0}, {3089, 0.5714f, 369, 370, 300, 2, 37, -1, 0, 1}, {3090, 0.5714f, 371, 372, 200, 2, 40, -1, 0, 4}, {3091, 0.5714f, 373, 374, 1800, 0, 119, -1, 0, 0}, {3092, 0.5714f, 375, 376, 60, 11, 129, -1, 0, 0}, {3093, 0.5714f, 377, 378, 220, 2, 38, -1, 0, 2}, {3094, 0.5714f, 379, 380, 120, 0, 2, -1, 0, 0}, {3095, 0.5714f, 381, 382, 40, 9, 130, 10, 0, 0}, {3095, 0.5714f, 383, 384, 80, 9, 131, 28, 0, 0}, {3096, 0.5714f, 385, 386, 100, 16, 133, -1, 0, 0}, {3097, 0.5714f, 387, 388, 100, 16, 134, -1, 0, 0}, {3098, 0.5714f, 389, 390, 100, 16, 135, -1, 0, 0}, {3099, 0.5714f, 391, 392, 100, 16, 137, 147, 0, 0}, {3100, 0.5714f, 393, 394, 100, 16, 136, -1, 0, 0}, {3101, 0.5714f, 395, 396, 100, 17, 139, -1, 0, 0}, {3102, 0.5714f, 397, 398, 100, 17, 140, -1, 0, 0}, {3103, 0.5714f, 399, 400, 100, 17, 141, 14, 0, 0}, {3104, 0.5714f, 401, 402, 210, 17, 142, 14, 0, 0}, {3105, 0.5714f, 403, 404, 250, 2, 44, -1, 0, 8}, {3106, 0.5714f, 405, 406, 300, 2, 54, -1, 0, 18}, {3107, 0.5714f, 407, 408, 120, 2, 50, -1, 0, 14}, {3108, 0.5714f, 409, 410, 220, 2, 55, -1, 0, 19}, {3109, 0.5714f, 411, 412, 800, 2, 43, -1, 0, 7}, {3110, 0.5714f, 413, 414, 120, 8, 143, -1, 5, 0}, {3110, 0.5714f, 413, 414, 500, 8, 144, -1, 10, 0}, {3110, 0.5714f, 413, 414, 900, 8, 145, -1, 18, 0}, {3110, 0.5714f, 413, 415, 1400, 8, 146, -1, 25, 0}}#define SHOP_FIRST {0, 8, 21, 30}-#define SHOP_ROW_GEO {3024, 1.4551f, 0.0000f, 1.0000f, 1.0000f}+#define SHOP_ROW_GEO {3085, 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}@@ -1261,21 +1281,21 @@#define COLLECT_MOVER_TO {-7.7000f, 6.0400f}#define STAG_AT {0.3000f, 0.3000f}#define STAG_K 1.2646f-#define STAG_BACKING {3050, -0.4427f, 0.0000f, 1.0000f, 0.6408f}+#define STAG_BACKING {3111, -0.4427f, 0.0000f, 1.0000f, 0.6408f}#define STAG_BACKING_A 0.9020f-#define STAG_PIECES {{3051, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {3052, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {3053, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3054, 0.4147f, 1.5909f, 1.0000f, 1.0000f}}+#define STAG_PIECES {{3112, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {3113, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {3114, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3115, 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 {3055, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define STAG_MAP_SHADOW {3056, 0.0110f, -0.0100f, 1.0000f, 0.9227f}+#define STAG_MAP_KNIGHT {3116, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define STAG_MAP_SHADOW {3117, 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 {3057, 2.8680f, 0.6180f, -1.0000f, 1.0000f}-#define STAG_POINTER_L {3057, -2.8680f, 0.6180f, 1.0000f, 1.0000f}+#define STAG_POINTER_R {3118, 2.8680f, 0.6180f, -1.0000f, 1.0000f}+#define STAG_POINTER_L {3118, -2.8680f, 0.6180f, 1.0000f, 1.0000f}#define STAG_ROW {-7.5992f, 3.9576f}-#define STAG_LIST_KNIGHT {3055, -10.5102f, 4.6056f, 1.0000f, 1.0000f}-#define STAG_DIVIDER {3058, -7.6003f, 5.2734f, -1.0000f, -0.8696f}+#define STAG_LIST_KNIGHT {3116, -10.5102f, 4.6056f, 1.0000f, 1.0000f}+#define STAG_DIVIDER {3119, -7.6003f, 5.2734f, -1.0000f, -0.8696f}#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}#define TXT_STAG_STATIONS 420#define TXT_STAG_NAMES {421, 381, 383}@@ -1291,52 +1311,52 @@#define STAG_SCENES_STR {137, 136, 138}#define STAG_SCENES_ROOM {4, 19, 36}#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 426, 0x14u}, {2, 25, 130, -0.0400f, -7.8800f, 429, 0x400020u}, {27, 16, 131, 16.3100f, -7.8700f, 430, 0x40u}}-#define MAP_ROOMS {{0, 1, 3059, 3060, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 0, 3066, 3067, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 12, -1, -1, -1.5030f, 5.1050f, 0.0000f, 0.0000f, 0x000000, 0}, {1, 127, 3069, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 3070, 3071, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 19, 3072, -1, 1.4650f, 4.4640f, 0.6500f, 0.3100f, 0xB5DDFB, 0}, {1, 255, 3073, 3074, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 15, 3075, 3076, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 9, 3077, -1, -3.0980f, 6.4880f, 1.1110f, 0.4800f, 0xB5DDFB, 0}, {1, 10, 3079, 3080, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 25, 3081, -1, -0.6440f, 4.4430f, 0.7000f, 0.3700f, 0xB5DDFB, 0}, {1, 14, 3083, 3084, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 20, 3085, 3086, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 38, 3087, -1, -2.2000f, 3.7130f, 0.6600f, 0.7900f, 0xB5DDFB, 0}, {1, 17, 3088, 3089, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 16, 3090, 3091, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3092, 3093, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3094, 3095, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 26, 3096, -1, -3.7180f, 5.7650f, 2.3517f, 0.4300f, 0xB5DDFB, 0}, {1, 13, 3098, 3099, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 24, 3100, 3101, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 8, 3102, 3103, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 11, 3104, -1, -1.5030f, 5.1050f, 0.8500f, 0.8900f, 0xB5DDFB, 0}, {1, 21, 3105, -1, 3.7290f, 3.4460f, 2.4100f, 0.6600f, 0xB5DDFB, 0}, {1, 18, 3107, 3108, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 6, 3109, 3110, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 5, 3111, 3112, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 3113, 3114, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 33, 3115, 3116, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 32, 3117, 3118, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 3119, 3120, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 35, 3121, -1, -12.3910f, 5.0270f, 0.5700f, 1.9700f, 0xCFFFC3, 0}, {2, 34, 3122, 3123, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3124, 3125, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 30, 3126, -1, -9.2170f, 5.6940f, 1.2300f, 0.4400f, 0xCFFFC3, 0}, {2, 36, 3127, -1, -12.9760f, 5.8120f, 0.6000f, 0.3000f, 0xCFFFC3, 0}, {2, 255, 3128, 3129, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3130, 3131, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 37, 3132, 3133, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 31, 3134, -1, -10.4130f, 5.6780f, 1.1700f, 0.5500f, 0xCFFFC3, 0}, {2, 29, 3135, 3136, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 28, 3137, 3138, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 27, 3139, 3140, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}-#define MAP_PINS {{0, 0, 3061, -2.0390f, 7.7500f, 133, -1}, {0, 0, 3062, -1.6430f, 7.7500f, 137, -1}, {0, 0, 3063, -2.4700f, 7.7500f, 135, 122}, {0, 0, 3064, -1.2540f, 7.7600f, 135, 123}, {1, 1, 3068, -6.2100f, 7.6800f, 134, -1}, {2, 1, 3068, -1.3150f, 5.0920f, 134, -1}, {5, 0, 3062, 1.2400f, 4.4520f, 137, -1}, {5, 0, 3061, 1.6210f, 4.4490f, 133, -1}, {8, 0, 3078, -3.0697f, 6.4597f, 135, -1}, {10, 0, 3061, -0.3430f, 4.4060f, 133, -1}, {10, 0, 3082, -0.7200f, 4.3930f, 136, -1}, {22, 0, 3061, -1.6940f, 5.0880f, 133, -1}, {23, 0, 3106, 4.5530f, 3.3700f, 135, 124}, {23, 0, 3061, 4.9480f, 3.3820f, 133, -1}, {28, 1, 3068, -10.9970f, 6.6240f, 134, -1}, {29, 0, 3061, -11.2580f, 4.9690f, 133, -1}, {35, 0, 3061, -12.8160f, 5.7890f, 133, -1}, {35, 0, 3062, -13.1960f, 5.7970f, 137, -1}, {41, 0, 3061, -7.6610f, 6.0700f, 133, -1}}-#define MAP_NEXT {{0, 3065, -1.0730f, 6.4850f, 180.0000f, 425, -1.0730f, 6.1870f, 1, -1}, {18, 3097, -5.2607f, 5.8454f, 90.0000f, 427, -5.5969f, 6.0434f, 2, 16}, {26, 3065, -1.0730f, 7.2500f, 0.0000f, 424, -1.0930f, 7.9120f, 1, -1}, {42, 3065, -4.5300f, 5.8450f, -90.0000f, 425, -4.1075f, 6.0470f, 0, 6}}+#define MAP_ROOMS {{0, 1, 3120, 3121, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 0, 3127, 3128, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 12, -1, -1, -1.5030f, 5.1050f, 0.0000f, 0.0000f, 0x000000, 0}, {1, 127, 3130, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 3131, 3132, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 19, 3133, -1, 1.4650f, 4.4640f, 0.6500f, 0.3100f, 0xB5DDFB, 0}, {1, 255, 3134, 3135, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 15, 3136, 3137, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 9, 3138, -1, -3.0980f, 6.4880f, 1.1110f, 0.4800f, 0xB5DDFB, 0}, {1, 10, 3140, 3141, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 25, 3142, -1, -0.6440f, 4.4430f, 0.7000f, 0.3700f, 0xB5DDFB, 0}, {1, 14, 3144, 3145, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 20, 3146, 3147, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 38, 3148, -1, -2.2000f, 3.7130f, 0.6600f, 0.7900f, 0xB5DDFB, 0}, {1, 17, 3149, 3150, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 16, 3151, 3152, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3153, 3154, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3155, 3156, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 26, 3157, -1, -3.7180f, 5.7650f, 2.3517f, 0.4300f, 0xB5DDFB, 0}, {1, 13, 3159, 3160, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 24, 3161, 3162, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 8, 3163, 3164, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 11, 3165, -1, -1.5030f, 5.1050f, 0.8500f, 0.8900f, 0xB5DDFB, 0}, {1, 21, 3166, -1, 3.7290f, 3.4460f, 2.4100f, 0.6600f, 0xB5DDFB, 0}, {1, 18, 3168, 3169, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 6, 3170, 3171, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 5, 3172, 3173, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 3174, 3175, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 33, 3176, 3177, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 32, 3178, 3179, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 3180, 3181, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 35, 3182, -1, -12.3910f, 5.0270f, 0.5700f, 1.9700f, 0xCFFFC3, 0}, {2, 34, 3183, 3184, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3185, 3186, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 30, 3187, -1, -9.2170f, 5.6940f, 1.2300f, 0.4400f, 0xCFFFC3, 0}, {2, 36, 3188, -1, -12.9760f, 5.8120f, 0.6000f, 0.3000f, 0xCFFFC3, 0}, {2, 255, 3189, 3190, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3191, 3192, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 37, 3193, 3194, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 31, 3195, -1, -10.4130f, 5.6780f, 1.1700f, 0.5500f, 0xCFFFC3, 0}, {2, 29, 3196, 3197, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 28, 3198, 3199, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 27, 3200, 3201, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}+#define MAP_PINS {{0, 0, 3122, -2.0390f, 7.7500f, 133, -1}, {0, 0, 3123, -1.6430f, 7.7500f, 137, -1}, {0, 0, 3124, -2.4700f, 7.7500f, 135, 122}, {0, 0, 3125, -1.2540f, 7.7600f, 135, 123}, {1, 1, 3129, -6.2100f, 7.6800f, 134, -1}, {2, 1, 3129, -1.3150f, 5.0920f, 134, -1}, {5, 0, 3123, 1.2400f, 4.4520f, 137, -1}, {5, 0, 3122, 1.6210f, 4.4490f, 133, -1}, {8, 0, 3139, -3.0697f, 6.4597f, 135, -1}, {10, 0, 3122, -0.3430f, 4.4060f, 133, -1}, {10, 0, 3143, -0.7200f, 4.3930f, 136, -1}, {22, 0, 3122, -1.6940f, 5.0880f, 133, -1}, {23, 0, 3167, 4.5530f, 3.3700f, 135, 124}, {23, 0, 3122, 4.9480f, 3.3820f, 133, -1}, {28, 1, 3129, -10.9970f, 6.6240f, 134, -1}, {29, 0, 3122, -11.2580f, 4.9690f, 133, -1}, {35, 0, 3122, -12.8160f, 5.7890f, 133, -1}, {35, 0, 3123, -13.1960f, 5.7970f, 137, -1}, {41, 0, 3122, -7.6610f, 6.0700f, 133, -1}}+#define MAP_NEXT {{0, 3126, -1.0730f, 6.4850f, 180.0000f, 425, -1.0730f, 6.1870f, 1, -1}, {18, 3158, -5.2607f, 5.8454f, 90.0000f, 427, -5.5969f, 6.0434f, 2, 16}, {26, 3126, -1.0730f, 7.2500f, 0.0000f, 424, -1.0930f, 7.9120f, 1, -1}, {42, 3126, -4.5300f, 5.8450f, -90.0000f, 425, -4.1075f, 6.0470f, 0, 6}}#define MAP_NAMES {{0, -1, 423, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 424, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 425, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {1, 22, 428, 3.4800f, 5.6971f, 0xB5DCFB, 1, 0}, {2, -1, 427, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}#define MAP_QUICK_K 1.5500f-#define MAP_SHADE {{3141, 0.0055f, -0.0110f, 178}, {3142, 0.0000f, 0.0000f, 255}}-#define MAP_MARKERS {3143, 3144, 3145, 3146}+#define MAP_SHADE {{3202, 0.0055f, -0.0110f, 178}, {3203, 0.0000f, 0.0000f, 255}}+#define MAP_MARKERS {3204, 3205, 3206, 3207}#define MAP_COMPASS_K 0.7000f#define MAP_BG_A 0.4438f#define MAP_TITLE {0.0000f, 7.5363f}-#define MAP_TITLE_BACK {3147, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}-#define MAP_NO_MAP {3148, 0.0000f, 0.9400f}+#define MAP_TITLE_BACK {3208, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}+#define MAP_NO_MAP {3209, 0.0000f, 0.9400f}#define MAP_NO_MAP_MSG {431, -0.0600f, -1.2932f}-#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 432, 3149, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}+#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 432, 3210, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}#define MAP_MSG_K 0.7000f#define FIRSTMAP_BG_A 0.6410f#define FIRSTMAP_TEXTS {{433, 0.0000f, 5.0305f}, {198, 0.0000f, -0.8796f}, {434, 0.0000f, -3.2895f}, {435, 0.0000f, -4.6996f}}-#define FIRSTMAP_PIECES {{3150, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3151, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3152, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}+#define FIRSTMAP_PIECES {{3211, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3212, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3213, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}#define FIRSTMAP_KEY {436, 0.0900f, -2.3200f}-#define MAP_WIDE {{{3153, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 437, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3154, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 438, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3155, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 439, {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 {{{3214, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 437, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3215, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 438, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3216, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 439, {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 {{3156, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3156, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3156, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3156, 17.1900f, -7.1700f, 1.0f, -90.0000f}}-#define MAP_ACT_CONFIRM {{3157, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {440, 441, 441}}-#define MAP_ACT_MARKER {{3157, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {442, 443, 444}}-#define MAP_ACT_CANCEL {{3157, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {356, 356, 356}}-#define MAP_ACT_CHANGE {{3157, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {445, 445, 445}}-#define MAP_ACT_KEY {{3157, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {446, 447, 448}}-#define MAP_KEY_BB {3158, 13.6200f, 3.4200f, 0.3781f, 1.0000f}+#define MAP_PAN_ARROWS {{3217, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3217, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3217, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3217, 17.1900f, -7.1700f, 1.0f, -90.0000f}}+#define MAP_ACT_CONFIRM {{3218, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {440, 441, 441}}+#define MAP_ACT_MARKER {{3218, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {442, 443, 444}}+#define MAP_ACT_CANCEL {{3218, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {356, 356, 356}}+#define MAP_ACT_CHANGE {{3218, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {445, 445, 445}}+#define MAP_ACT_KEY {{3218, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {446, 447, 448}}+#define MAP_KEY_BB {3219, 13.6200f, 3.4200f, 0.3781f, 1.0000f}#define MAP_KEY_STEP -0.8250f-#define MAP_KEY_ROWS {{{3159, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 449, {12.7550f, -1.5413f, 15.3500f}}, {{3160, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 450, {12.7550f, -1.5413f, 15.3500f}}, {{3161, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 451, {12.7550f, -1.5413f, 15.3500f}}, {{3162, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 452, {12.7550f, -1.5413f, 15.3500f}}, {{3163, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 453, {12.7550f, -1.5413f, 15.3500f}}}+#define MAP_KEY_ROWS {{{3220, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 449, {12.7550f, -1.5413f, 15.3500f}}, {{3221, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 450, {12.7550f, -1.5413f, 15.3500f}}, {{3222, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 451, {12.7550f, -1.5413f, 15.3500f}}, {{3223, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 452, {12.7550f, -1.5413f, 15.3500f}}, {{3224, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 453, {12.7550f, -1.5413f, 15.3500f}}}#define MAP_KEY_FLAGS {133, 134, 135, 136, 137}#define MAP_KEY_N 5-#define MAP_MM_PIECES {{3164, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3165, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3166, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3167, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}-#define MAP_MM_MARKERS {3168, 3169, 3170, 3171}+#define MAP_MM_PIECES {{3225, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3226, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3227, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3228, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}+#define MAP_MM_MARKERS {3229, 3230, 3231, 3232}#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 {3172, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}+#define MAP_MM_PLACE {3233, 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 454#define ROOM_ZONES {2, 4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 22, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 9, 9, 9, 9, 24, 24}#define MSG_FIREBALL 0#define MSG_DASH 1-#define SEMI_PERSIST {3, 43, 44, 59, 64, 85, 87, 88, 91, 92, 93, 95, 101, 102, 103, 104, 109, 110, 111, 116, 119, 121, 141, 143, 144, 149, 154, 163, 166, 167, 168, 169, 178, 191, 192, 197, 198, 199, 201, 202, 203, 212, 219, 220, 221, 222, 223, 224, 229, 230, 235, 236, 237, 238, 262, 263, 280, 281, 282, 293, 294, 295}+#define SEMI_PERSIST {3, 43, 44, 59, 64, 85, 87, 88, 91, 92, 93, 95, 101, 102, 103, 104, 109, 110, 111, 116, 119, 121, 141, 143, 144, 149, 154, 163, 166, 167, 168, 169, 178, 191, 192, 197, 198, 199, 201, 202, 203, 212, 219, 220, 221, 222, 223, 224, 229, 230, 235, 236, 237, 238, 257, 258, 259, 260, 266, 267, 268, 269, 270, 287, 288, 289, 300, 301, 302}diff --git a/games/hollowknight/src/enemy.c b/games/hollowknight/src/enemy.cindex c70c0e29..0ee88557 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,/* (past Greenpath: HK_XL) */- EF_FUNGLING, EF_FUNGOON, EF_AMBLOOM+ EF_FUNGLING, EF_FUNGOON, EF_AMBLOOM, EF_SHRUMELING};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 {@@ -6539,6 +6539,9 @@ void enemies_enter(void) {memset(&sh, 0, sizeof sh);memset(balls, 0, sizeof balls);memset(bullets, 0, sizeof bullets);+#ifdef HK_XL+ xl_enter();+#endifmemset(waves, 0, sizeof waves);memset(spurts, 0, sizeof spurts);memset(&gm, 0, sizeof gm);@@ -6647,6 +6650,9 @@ void enemies_fixed(void) {geo_tick();balls_tick();bullets_tick();+#ifdef HK_XL+ xl_tick();+#endifwaves_tick();fk_arena_tick();fk_head_place();@@ -6769,8 +6775,14 @@ void enemies_draw(void) {sprite_inst(sh.slash.sprite, e->body.x - 0.0486f * e->sx, e->body.y - 0.0117f, z - 0.001f, 1.27f * e->sx, 1, 0, &in);gfx_actor(&in, SORT_KEY(0, 0));}+#ifdef HK_XL+ xl_draw_enemy(e, z, flash_tint(e, 2 + i % 5));+#endif}bullets_draw();+#ifdef HK_XL+ xl_draw();+#endifspurts_draw();fk_arena_draw();gfly_corpse_draw();@@ -6924,6 +6936,9 @@ int enemies_touch_hero(float x0, float y0, float x1, float y1, int *side) {}int dmg = bullets_touch_hero(x0, y0, x1, y1, side);if (dmg) return dmg;+#ifdef HK_XL+ if ((dmg = xl_touch(x0, y0, x1, y1, side))) return dmg;+#endifdmg = spurts_touch(x0, y0, x1, y1, side);if (dmg) return dmg;dmg = barrels_touch(x0, y0, x1, y1, side);@@ -6951,6 +6966,11 @@ void enemies_debug(void) {int ng = 0;for (int i = 0; i < MAX_GEO; i++) ng += geo[i].on;printf(" geo %d pieces, %d in purse, mp %d\n", ng, g_pd.geo, g_pd.mp);+#ifdef HK_XL+ int ngas = 0;+ for (int i = 0; i < MAX_GAS; i++) ngas += gas[i].on;+ printf(" gas %d\n", ngas);+#endif}/* (tests: the enemy of the room's record ent out and alive) */diff --git a/games/hollowknight/src/enemy_xl.c b/games/hollowknight/src/enemy_xl.cindex 3fde7fba..6af962f4 100644--- a/games/hollowknight/src/enemy_xl.c+++ b/games/hollowknight/src/enemy_xl.c@@ -1,11 +1,29 @@/* The enemies past Greenpath (HK_XL: the bigger game), each kind's FSM as the game has it. Part of enemy.c: its* helpers are theirs. */+/* a range of an enemy's by its name (ET_RANGE: a child's trigger), or NULL */+static const Ent *range_named(const Enemy *e, const char *name) {+ if (e->ent == NO_ENT) return NULL;+ const Ent *d = ent_at(e->ent);+ for (int i = 1; i <= d->s0; i++)+ if (d[i].type == ENT_BOX && d[i].flags == ET_RANGE && !strcmp(str_at(d[i].s0), name)) return &d[i];+ return NULL;+}+static bool hero_in_range(const Enemy *e, const char *name) {+ const Ent *r = range_named(e, name);+ return r && hero_in_box(e, r->x0, r->y0, r->x1, r->y1);+}++/* a place in an enemy's own units -> the world's */+static void enemy_at(const Enemy *e, float lx, float ly, float *x, float *y) {+ enemy_point(e, lx, ly, x, y);+ *x += e->body.x, *y += e->body.y;+}+/* the Knight in an enemy's Wake Region (EnemyWakeRegion: WAKE as he comes in, SLEEP as he leaves): +1 in, -1 out,* 0 as it was (b0: in) */static int wake_region(Enemy *e) {- const Ent *r = enemy_rec(e, ET_RANGE);- bool in = r && hero_in_box(e, r->x0, r->y0, r->x1, r->y1);+ bool in = hero_in_range(e, "Wake Region");int ev = in && !e->b0 ? 1 : !in && e->b0 ? -1 : 0;e->b0 = in;return ev;@@ -102,8 +120,227 @@ static void ambloom_fixed(Enemy *e) {}}+/* ---------------------------------------------------------------- gas (Gas Projectile: Gas Control): flung, a circle+ * that grows for 0.75 s, hurting; then its particles die away, the circle gone. Its particles (Gas Attack: many small+ * puffs about it, shrinking as they go) drawn as one puff of their texture */+#define MAX_GAS 32+#define GAS_GROW 0.75f+#define GAS_FADE 0.35f /* (its particles' lifetime) */+typedef struct {+ bool on;+ float x, y, vx, vy, t;+} Gas;+static Gas gas[MAX_GAS];++static void gas_fling(float x, float y, float speed, float deg) {+ for (int i = 0; i < MAX_GAS; i++)+ if (!gas[i].on) {+ float a = deg * (float)M_PI / 180;+ gas[i] = (Gas){true, x, y, cosf(a) * speed, sinf(a) * speed, 0};+ return;+ }+}++static float gas_scale(const Gas *g) { return 1 + 2 * (g->t < GAS_GROW ? g->t : GAS_GROW); } /* (FloatAddV2, 2 a second) */++static void gas_tick(void) {+ for (int i = 0; i < MAX_GAS; i++) {+ Gas *g = &gas[i];+ if (!g->on) continue;+ if ((g->t += DT) >= GAS_GROW + 0.4f) { /* (Stop: 0.4 s, then recycled) */+ g->on = false;+ continue;+ }+ /* (its circle meets the terrain: stopped there) */+ float dx = g->vx * DT, dy = g->vy * DT, l = sqrtf(dx * dx + dy * dy), r = 0.5f * gas_scale(g);+ if (l > 0 && phys_ray(g->x, g->y, dx / l, dy / l, l + r, CF_TERRAIN, NULL)) g->vx = g->vy = 0;+ else g->x += dx, g->y += dy;+ }+}++static int gas_touch(float x0, float y0, float x1, float y1, int *side) {+ for (int i = 0; i < MAX_GAS; i++) {+ const Gas *g = &gas[i];+ if (!g->on || g->t >= GAS_GROW) continue;+ float r = 0.5f * gas_scale(g), qx = g->x < x0 ? x0 : g->x > x1 ? x1 : g->x, qy = g->y < y0 ? y0 : g->y > y1 ? y1 : g->y;+ if ((qx - g->x) * (qx - g->x) + (qy - g->y) * (qy - g->y) < r * r) {+ *side = g->x > (x0 + x1) / 2 ? SIDE_RIGHT : SIDE_LEFT;+ return 1;+ }+ }+ return 0;+}++static void gas_draw(void) {+ uint8_t tint = gfx_dyn_tint(9, 255, 255, 255, 200); /* (its particles' colour over their life: white, 0.78) */+ for (int i = 0; i < MAX_GAS; i++) {+ const Gas *g = &gas[i];+ if (!g->on) continue;+ /* (as wide as its particles spread, its shape's radius 0.75 at its scale, and their size; shrinking as they die) */+ float k = g->t < GAS_GROW ? 1 : 1 - (g->t - GAS_GROW) / GAS_FADE;+ if (k <= 0) continue;+ float d = (1.5f * gas_scale(g) + 1.0f) * k;+ Inst in;+ sprite_inst(SPRITE_GAS, g->x, g->y, -0.001f, d, d, tint, &in);+ gfx_actor_minor(&in, SORT_KEY(0, 0));+ }+}++/* ---------------------------------------------------------------- Fungoons (Fungus Flyer): asleep till the Knight+ * comes near; buzzing about, they spit gas down at him as he comes under them, a little to one side */+enum { FN_SLEEP, FN_IDLE, FN_ANTIC, FN_SPIT, FN_RECOVER, FN_CD };+/* (b0: in its Wake Region; qx, qy: its spit's angles; wait: a state's; t1: FlingObjectsFromGlobalPoolTime's timer;+ * c0: its spit effect on) */+static void fungoon_start(Enemy *e) {+ e->start_x = e->body.x, e->start_y = e->body.y;+ e->wait = 0, e->ax = e->ay = 0, e->b0 = false, e->c0 = 0;+ e->st = FN_SLEEP, e->body.vx = e->body.vy = 0;+}++static void fungoon_fixed(Enemy *e) {+ switch (e->st) {+ case FN_SLEEP: e->body.vx = e->body.vy = 0; break;+ case FN_IDLE: idle_buzz_xy(e, 0.5f, 0.75f, 4, 20, 3, 1); break;+ case FN_SPIT: e->body.vy += 1 * DT; break; /* (AddForce2d up, its mass 1) */+ case FN_CD: idle_buzz_xy(e, 0.75f, 1, 2.5f, 20, 3, 1); break;+ }+}++static void fungoon_update(Enemy *e) {+ int w = wake_region(e);+ if (w < 0) {+ e->st = FN_SLEEP, e->c0 = 0; /* (SLEEP: its spit effect off) */+ return;+ }+ bool done = (e->anim.events & ANIM_DONE) != 0;+ switch (e->st) {+ case FN_SLEEP:+ if (w > 0) anim_play(&e->anim, CLIP(e, R_IDLE)), e->st = FN_IDLE; /* (Wake) */+ break;+ case FN_IDLE: {+ bool r = hero_in_range(e, "Attack R"), l = !r && hero_in_range(e, "Attack L");+ if (!r && !l) break;+ /* Attack Right, Left: facing that way, the spit's angles; Spit Antic */+ set_scale_x(e, r ? -1 : 1);+ e->qx = r ? 278 : 248, e->qy = r ? 292 : 262;+ anim_play_from_frame(&e->anim, CLIP(e, R_A1), 0);+ e->st = FN_ANTIC;+ break;+ }+ case FN_ANTIC:+ if (done) {+ /* Spit: gas a while, its effect at its mouth */+ anim_play_from_frame(&e->anim, CLIP(e, R_A2), 0);+ anim_play_from_frame(&e->sub, CLIP(e, R_A4), 0);+ e->st = FN_SPIT, e->wait = 1, e->c0 = 1;+ }+ break;+ case FN_SPIT:+ e->sub.events = 0;+ anim_update(&e->sub, DT);+ if ((e->t1 += DT) >= 0.05f) {+ e->t1 = 0;+ float x, y;+ enemy_at(e, -0.46f, -2.71f, &x, &y); /* (Spawn Point) */+ gas_fling(x, y, rand_range(10, 11), rand_range(e->qx, e->qy));+ }+ if ((e->wait -= DT) <= 0) anim_play_from_frame(&e->anim, CLIP(e, R_A3), 0), e->st = FN_RECOVER, e->c0 = 0;+ break;+ case FN_RECOVER:+ if (done) {+ /* Spit CD: buzzing, facing left again, for a second */+ set_scale_x(e, 1);+ anim_play(&e->anim, CLIP(e, R_IDLE));+ e->st = FN_CD, e->wait = 1;+ }+ break;+ case FN_CD:+ if ((e->wait -= DT) <= 0) e->st = FN_IDLE;+ break;+ }+}++/* (its spit effect at its mouth: Spit Effect, on while it spits) */+static void fungoon_draw(const Enemy *e, float z, uint8_t tint) {+ if (e->st != FN_SPIT || !e->c0 || e->sub.sprite < 0) return;+ float x, y;+ enemy_at(e, -0.8231f, -3.8136f, &x, &y);+ Inst in;+ sprite_inst(e->sub.sprite, x, y, z - 0.001f, e->sx, 1, tint, &in);+ gfx_actor(&in, SORT_KEY(0, 0));+}++/* ---------------------------------------------------------------- Shrumelings (Shroom Mini): asleep in one of three+ * poses, they wake as the Knight comes near and run from him, bouncing off the walls */+enum { SM_SLEEPING, SM_WAKE, SM_STARTLE, SM_RUN_R, SM_RUN_L };+#define SM_ACCEL (0.13f * 1.2f) /* (0.13 a frame of the game's 60 a second) */+/* (b0: in its Wake Region; ax: Scale; c0: its pose) */+static void shrumeling_start(Enemy *e) {+ /* Scale: 0.75 to 1, either way; Anim Pick */+ e->ax = rand_range(0.75f, 1);+ e->sx = rand_range(0, 1) < 0.5f ? -e->ax : e->ax;+ e->c0 = (uint8_t)rand_range(0, 2.999f);+ static const int16_t rest[3] = {CLIP_SHRUMELING_MINI_REST_1, CLIP_SHRUMELING_MINI_REST_2, CLIP_SHRUMELING_MINI_REST_3};+ anim_play(&e->anim, rest[e->c0]);+ e->st = SM_SLEEPING, e->b0 = false;+}++static void shrumeling_run(Enemy *e, bool right) {+ set_scale_x(e, right ? -e->ax : e->ax);+ anim_play(&e->anim, CLIP(e, R_A2));+ e->st = right ? SM_RUN_R : SM_RUN_L;+}++static void shrumeling_fixed(Enemy *e) {+ if (e->st != SM_RUN_R && e->st != SM_RUN_L) return;+ bool right = e->st == SM_RUN_R;+ float v = e->body.vx + (right ? SM_ACCEL : -SM_ACCEL);+ e->body.vx = v < -4.5f ? -4.5f : v > 4.5f ? 4.5f : v;+}++static void shrumeling_update(Enemy *e) {+ int w = wake_region(e);+ bool done = (e->anim.events & ANIM_DONE) != 0;+ switch (e->st) {+ case SM_SLEEPING:+ if (w > 0) {+ static const int16_t wake[3] = {CLIP_SHRUMELING_MINI_REST_TO_WAKE_1, CLIP_SHRUMELING_MINI_REST_TO_WAKE_2,+ CLIP_SHRUMELING_MINI_REST_TO_WAKE_3};+ anim_play_from_frame(&e->anim, wake[e->c0], 0);+ e->st = SM_WAKE;+ }+ break;+ case SM_WAKE:+ if (done) anim_play_from_frame(&e->anim, CLIP(e, R_A1), 0), e->st = SM_STARTLE;+ break;+ case SM_STARTLE:+ if (done) shrumeling_run(e, hero_x() <= e->body.x); /* (Direction: away from the Knight) */+ break;+ case SM_RUN_R:+ case SM_RUN_L: {+ bool right = e->st == SM_RUN_R;+ if (right ? hero_x() > e->body.x : hero_x() < e->body.x) {+ shrumeling_run(e, !right); /* (the Knight that way: the other) */+ break;+ }+ if (e->body.ncontacts && side_hit(e, right ? 0 : 2)) {+ /* Bump: off the wall, up */+ e->body.vx = right ? rand_range(-5, -2.5f) : rand_range(2.5f, 5), e->body.vy = 10;+ }+ 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); }+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_draw_enemy(const Enemy *e, float z, uint8_t tint) {+ if (FSM(e) == EF_FUNGOON && e->mode == EM_ALIVE) fungoon_draw(e, z, tint);+}static void xl_contact(Enemy *e, const BodyEvent *v) {if (FSM(e) == EF_FUNGLING && v->kind == EV_ENTER && e->st == FG_IDLE && !e->b1) {@@ -115,14 +352,20 @@ static void xl_contact(Enemy *e, const BodyEvent *v) {static void xl_start(Enemy *e, const Ent *d) {if (FSM(e) == EF_FUNGLING) fungling_start(e);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);}static void xl_fixed(Enemy *e) {if (FSM(e) == EF_FUNGLING) fungling_fixed(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);}static void xl_update(Enemy *e) {if (FSM(e) == EF_FUNGLING) fungling_update(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);}diff --git a/games/hollowknight/tools/actors.py b/games/hollowknight/tools/actors.pyindex a8829dfd..887e6f78 100644--- a/games/hollowknight/tools/actors.py+++ b/games/hollowknight/tools/actors.py@@ -102,6 +102,11 @@ XL_KINDS = [("fungling", "Fungoon baby", ("sharedassets167.assets", 180), "FUNGLING", {"IDLE": "Idle", "A1": "TurnToIdle","DEATH_AIR": "Death"}),("ambloom", "Walker", ("sharedassets168.assets", 48), "AMBLOOM", {"WALK": "Walk", "TURN": "Turn"}),+ ("fungoon", "Fungus Flyer", ("sharedassets167.assets", 134), "FUNGOON",+ {"IDLE": "Float", "A1": "Spit Antic", "A2": "Spit", "A3": "Spit Recover", "A4": "Effect", "DEATH_AIR": "Death"}),+ # (Shrumeling: its code plays its poses by name, CLIP_SHRUMELING_*)+ ("shrumeling", "Shroom Mini", ("sharedassets169.assets", 210), "SHRUMELING", {"IDLE": "Idle", "A1": "Startle", "A2": "Run"},+ ["Mini Rest 1", "Mini Rest 2", "Mini Rest 3", "Mini Rest to Wake 1", "Mini Rest to Wake 2", "Mini Rest to Wake 3"]),# (Fungified Husk: the Volatile Mosskin's FSM)("fungushusk", "Fungus Zombie Attack", ("sharedassets167.assets", 135), "SHAKER",{"IDLE": "Idle", "WALK": "Walk", "TURN": "Turn", "A1": "Attack"}),@@ -386,6 +391,15 @@ def unity_sprites(keys):object's scale."""out = []for level, exts, fid, pid, scale, res in keys:+ if level == "tex":+ # (a texture, scale units wide: a particle's, drawn as one)+ img = tk2d.atlas(exts, fid)+ wu, hu = scale, scale * img.height / img.width+ w, h = min(img.width, max(1, round(wu * K0 * res))), min(img.height, max(1, round(hu * K0 * res)))+ arr = np.asarray(img.resize((w, h), Image.BOX)).copy()+ out.append({"key": (exts, fid), "job": art.ImageJob(arr, "tex/%d" % fid), "lx": -wu / 2, "ty": hu / 2,+ "tu": wu / w, "tv": hu / h})+ continueif level == "tk2d":path, col, name = exts, fid, pidc = tk2d.collection(path, col)diff --git a/games/hollowknight/tools/ents.py b/games/hollowknight/tools/ents.pyindex 92dda642..981abf74 100644--- a/games/hollowknight/tools/ents.py+++ b/games/hollowknight/tools/ents.py@@ -45,7 +45,7 @@ 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",)}+ "Moss Knight Control": ("Wake Box",), "Mender Bug Ctrl": ("Hero Detect",), "Fungus Flyer": ("Attack R", "Attack L")}# (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@@ -137,6 +137,10 @@ class Sprites:"""A 2D Toolkit sprite of a collection (file, path id), by name."""return self._add(("tk2d", path, col, name, round(scale, 3), res))+ def tex(self, path, pid, size, res=1.0):+ """A texture of its own (a particle's), size units wide, centred."""+ return self._add(("tex", path, pid, 0, round(size, 3), res))+def _add(self, key):if key not in self.index:self.index[key] = len(self.list)