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: collapsing floors, hot spring, respawn triggers, camera lock fix
Mason Chen08d51f749c90
diff --git a/games/hollowknight/src/camera.c b/games/hollowknight/src/camera.cindex 1419e8d1..a7bb987e 100644--- a/games/hollowknight/src/camera.c+++ b/games/hollowknight/src/camera.c@@ -2,6 +2,9 @@* (looking up and down), both inside the scene and the room's lock areas. */#include <math.h>#include "game.h"+#ifdef HOST+#include <stdio.h>+#endif#define DT 0.02f#define X_MIN 14.6f@@ -30,7 +33,8 @@ static struct {int mode;float cx, cy, cvx, cvy, cdamp_x, cdamp_y, look_offset, x_limit, y_limit, start_locked_timer;float x_lock0, x_lock1, y_lock0, y_lock1;- int8_t locks[8], nlocks, cur_lock; /* lockZoneList, currentLockArea (entities) */+ int16_t locks[8], cur_lock; /* lockZoneList, currentLockArea (entities: a room has more than 127) */+ int8_t nlocks;} c;/* Mathf.SmoothDamp */@@ -179,9 +183,9 @@ void cam_lock(int ent) {c.entered_right = hx > e->x1 - 1 && hx < e->x1 + 1;c.entered_top = hy > e->y1 - 2 && hy < e->y1 + 2;c.entered_bot = hy > e->y0 - 1 && hy < e->y0 + 1;- if (c.nlocks < 8) c.locks[c.nlocks++] = (int8_t)ent;+ if (c.nlocks < 8) c.locks[c.nlocks++] = (int16_t)ent;if (c.cur_lock >= 0 && (es[c.cur_lock].flags & CL_MAX_PRIORITY) && !(e->flags & CL_MAX_PRIORITY)) return;- c.cur_lock = (int8_t)ent;+ c.cur_lock = (int16_t)ent;c.mode = CM_LOCKED;lock_bounds(e, &c.x_lock0, &c.y_lock0, &c.x_lock1, &c.y_lock1);if (c.start_locked_timer > 0) {@@ -342,3 +346,11 @@ void cam_freeze(void) {c.mode = CM_FROZEN;c.tmode = TM_FREE;}++#ifdef HOST+void cam_debug(void) {+ printf("cam %.2f,%.2f target %.2f,%.2f mode %d tmode %d locks %d:", c.cx, c.cy, c.tx, c.ty, c.mode, c.tmode, c.nlocks);+ for (int i = 0; i < c.nlocks; i++) printf(" %d", c.locks[i]);+ printf("\n");+}+#endifdiff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.binindex c9b1aba0..cf0b1bca 100644Binary files a/games/hollowknight/src/data.bin and b/games/hollowknight/src/data.bin differdiff --git a/games/hollowknight/src/data.h b/games/hollowknight/src/data.hindex d21f247d..ca32f7ea 100644--- a/games/hollowknight/src/data.h+++ b/games/hollowknight/src/data.h@@ -541,122 +541,124 @@#define CLIP_COCOON_SCUTTLER_RUN 481#define CLIP_FX_SPLAT 482#define CLIP_FX_SPLAT2 483-#define CLIP_FIREBALL_BLAST 484-#define CLIP_FIREBALL_BALL 485-#define CLIP_FIREBALL_BALL_END 486-#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 487-#define CLIP_DRIP_IDLE 488-#define CLIP_DRIP_DRIP 489-#define CLIP_DRIP_FALL 490-#define CLIP_DRIP_IMPACT 491-#define CLIP_HORNETCS_EVADE 492-#define CLIP_HORNETCS_EVADE_ANTIC 493-#define CLIP_HORNETCS_FALL 494-#define CLIP_HORNETCS_HARPOON_SIDE 495-#define CLIP_HORNETCS_IDLE 496-#define CLIP_HORNETCS_JUMP_FULL 497-#define CLIP_HORNETCS_POINT 498-#define CLIP_HORNETCS_RUN 499-#define CLIP_HORNETCS_SOFT_LAND 500-#define CLIP_HORNETCS_THREAD_1 501-#define CLIP_HORNETCS_THROW_SIDE 502-#define CLIP_HORNETCS_THROW_SIDE_START 503-#define CLIP_HORNETCS_TURN 504-#define CLIP_HORNETCS_TURNTOIDLE 505-#define CLIP_BULLET_IDLE 506-#define CLIP_BULLET_IMPACT 507-#define CLIP_BULLET_SHOCKWAVE_SPURT 508-#define CLIP_PROP0_WATERFALL_LOOP 509-#define CLIP_PROP1_TORCH2 510-#define CLIP_PROP1_TORCH3 511-#define CLIP_VM0_FLOWER 512-#define CLIP_VM0_IDLE 513-#define CLIP_VM0_REACH 514-#define CLIP_VM0_REACH_TO_IDLE 515-#define CLIP_VM0_TALK_LEFT 516-#define CLIP_VM0_TALK_RIGHT 517-#define CLIP_VM0_TURN_LEFT 518-#define CLIP_VM0_TURN_RIGHT 519-#define CLIP_VM2_IDLE 520-#define CLIP_VM2_LOOKLEFT 521-#define CLIP_VM2_LOOKRIGHT 522-#define CLIP_VM3_IDLE 523-#define CLIP_VM3_TALK 524-#define CLIP_VM3_TALK_END 525-#define CLIP_VM4_IDLE 526-#define CLIP_VM4_LOOKLEFT 527-#define CLIP_VM4_LOOKRIGHT 528-#define CLIP_VM4_SIT 529-#define CLIP_VM4_SIT_TALK 530-#define CLIP_VM4_SIT_TALK_END 531-#define CLIP_VM5_ARRIVE 532-#define CLIP_VM5_ARRIVE_SMOKE 533-#define CLIP_VM5_IDLE 534-#define CLIP_VM6_BELL_IDLE 535-#define CLIP_VM6_BELL_RING_R 536-#define CLIP_VM6_BELL_STAND 537-#define CLIP_VM6_BELL_STAND_APPEAR 538-#define CLIP_VM6_BOX_DISAPPEAR 539-#define CLIP_VM6_BOX_DISAPPEAR_QUICK 540-#define CLIP_VM6_BOX_IDLE 541-#define CLIP_VM6_FRONT 542-#define CLIP_VM6_GRATE_DISAPPEAR 543-#define CLIP_VM6_GRATE_IDLE 544-#define CLIP_VM8_DAZED 545-#define CLIP_VM8_IDLE 546-#define CLIP_VM8_TURN_L 547-#define CLIP_VM8_TURN_R 548-#define CLIP_VM8_WAKE 549-#define CLIP_VM11_HEGEMOL_CAST 550-#define CLIP_VM11_HEGEMOL_IDLE 551-#define CLIP_VM11_LURIEN_CAST 552-#define CLIP_VM11_LURIEN_IDLE 553-#define CLIP_VM11_MONOMON_CAST 554-#define CLIP_VM11_MONOMON_IDLE 555-#define CLIP_VM12_IDLE 556-#define CLIP_VM12_SIT_IDLE 557-#define CLIP_VM12_SIT_TALK 558-#define CLIP_VM12_SIT_TALK_END 559-#define CLIP_VM12_SUMMON 560-#define CLIP_VM12_TALK 561-#define CLIP_VM12_TALK_END 562-#define CLIP_VM12_TURN 563-#define CLIP_VM14_IDLE 564-#define CLIP_VM14_LOOK_LEFT 565-#define CLIP_VM14_LOOK_RIGHT 566-#define CLIP_VM14_TALK_CONVO_END 567-#define CLIP_VM14_TALK_CONVO_START 568-#define CLIP_VM14_TALK_SHOP_END 569-#define CLIP_VM14_TALK_SHOP_START 570-#define CLIP_VM15_IDLE 571-#define CLIP_VM15_SHOP_END 572-#define CLIP_VM15_SHOP_START 573-#define CLIP_VM15_TALK_END 574-#define CLIP_VM15_TALK_START 575-#define CLIP_VM16_CRY 576-#define CLIP_VM16_CRY_TURN 577-#define CLIP_VM16_FREED 578-#define CLIP_VM16_HOME_BOUNCE 579-#define CLIP_VM16_HOME_WAVE 580-#define CLIP_VM16_IDLE 581-#define CLIP_VM17_CRUMBLE 582-#define CLIP_VM17_IDLE 583-#define CLIP_VM18_BECKON 584-#define CLIP_VM18_CHEER 585-#define CLIP_VM18_CRY 586-#define CLIP_VM18_GIFT 587-#define CLIP_VM18_IDLE 588-#define CLIP_ANIM0_STAG_DOOR_OPEN00 589-#define CLIP_ANIM1_DASH_CLOAK_CORPSE000 590-#define CLIP_ANIM2_GROUND_PLINK_0 591-#define CLIP_ANIM3_FIREBALL_COLLECT_ANIM 592-#define SPRITE_HERO_LIGHT 2858-#define SPRITE_DIALOGUE_BACKBOARD 2859-#define SPRITE_PROMPT_SHADOW 2860-#define SPRITE_CORPSE_NAIL 2861-#define SPRITE_FK_BARREL 2862-#define SPRITE_FK_STAFF 2863-#define SPRITE_DIGIT0 3244+#define CLIP_FX_SWORD 484+#define CLIP_FIREBALL_BLAST 485+#define CLIP_FIREBALL_BALL 486+#define CLIP_FIREBALL_BALL_END 487+#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 488+#define CLIP_DRIP_IDLE 489+#define CLIP_DRIP_DRIP 490+#define CLIP_DRIP_FALL 491+#define CLIP_DRIP_IMPACT 492+#define CLIP_HORNETCS_EVADE 493+#define CLIP_HORNETCS_EVADE_ANTIC 494+#define CLIP_HORNETCS_FALL 495+#define CLIP_HORNETCS_HARPOON_SIDE 496+#define CLIP_HORNETCS_IDLE 497+#define CLIP_HORNETCS_JUMP_FULL 498+#define CLIP_HORNETCS_POINT 499+#define CLIP_HORNETCS_RUN 500+#define CLIP_HORNETCS_SOFT_LAND 501+#define CLIP_HORNETCS_THREAD_1 502+#define CLIP_HORNETCS_THROW_SIDE 503+#define CLIP_HORNETCS_THROW_SIDE_START 504+#define CLIP_HORNETCS_TURN 505+#define CLIP_HORNETCS_TURNTOIDLE 506+#define CLIP_BULLET_IDLE 507+#define CLIP_BULLET_IMPACT 508+#define CLIP_BULLET_SHOCKWAVE_SPURT 509+#define CLIP_PROP0_WATERFALL_LOOP 510+#define CLIP_PROP1_TORCH2 511+#define CLIP_PROP1_TORCH3 512+#define CLIP_VM0_FLOWER 513+#define CLIP_VM0_IDLE 514+#define CLIP_VM0_REACH 515+#define CLIP_VM0_REACH_TO_IDLE 516+#define CLIP_VM0_TALK_LEFT 517+#define CLIP_VM0_TALK_RIGHT 518+#define CLIP_VM0_TURN_LEFT 519+#define CLIP_VM0_TURN_RIGHT 520+#define CLIP_VM2_IDLE 521+#define CLIP_VM2_LOOKLEFT 522+#define CLIP_VM2_LOOKRIGHT 523+#define CLIP_VM3_IDLE 524+#define CLIP_VM3_TALK 525+#define CLIP_VM3_TALK_END 526+#define CLIP_VM4_IDLE 527+#define CLIP_VM4_LOOKLEFT 528+#define CLIP_VM4_LOOKRIGHT 529+#define CLIP_VM4_SIT 530+#define CLIP_VM4_SIT_TALK 531+#define CLIP_VM4_SIT_TALK_END 532+#define CLIP_VM5_ARRIVE 533+#define CLIP_VM5_ARRIVE_SMOKE 534+#define CLIP_VM5_IDLE 535+#define CLIP_VM6_BELL_IDLE 536+#define CLIP_VM6_BELL_RING_R 537+#define CLIP_VM6_BELL_STAND 538+#define CLIP_VM6_BELL_STAND_APPEAR 539+#define CLIP_VM6_BOX_DISAPPEAR 540+#define CLIP_VM6_BOX_DISAPPEAR_QUICK 541+#define CLIP_VM6_BOX_IDLE 542+#define CLIP_VM6_FRONT 543+#define CLIP_VM6_GRATE_DISAPPEAR 544+#define CLIP_VM6_GRATE_IDLE 545+#define CLIP_VM8_DAZED 546+#define CLIP_VM8_IDLE 547+#define CLIP_VM8_TURN_L 548+#define CLIP_VM8_TURN_R 549+#define CLIP_VM8_WAKE 550+#define CLIP_VM11_HEGEMOL_CAST 551+#define CLIP_VM11_HEGEMOL_IDLE 552+#define CLIP_VM11_LURIEN_CAST 553+#define CLIP_VM11_LURIEN_IDLE 554+#define CLIP_VM11_MONOMON_CAST 555+#define CLIP_VM11_MONOMON_IDLE 556+#define CLIP_VM12_IDLE 557+#define CLIP_VM12_SIT_IDLE 558+#define CLIP_VM12_SIT_TALK 559+#define CLIP_VM12_SIT_TALK_END 560+#define CLIP_VM12_SUMMON 561+#define CLIP_VM12_TALK 562+#define CLIP_VM12_TALK_END 563+#define CLIP_VM12_TURN 564+#define CLIP_VM14_IDLE 565+#define CLIP_VM14_LOOK_LEFT 566+#define CLIP_VM14_LOOK_RIGHT 567+#define CLIP_VM14_TALK_CONVO_END 568+#define CLIP_VM14_TALK_CONVO_START 569+#define CLIP_VM14_TALK_SHOP_END 570+#define CLIP_VM14_TALK_SHOP_START 571+#define CLIP_VM15_IDLE 572+#define CLIP_VM15_SHOP_END 573+#define CLIP_VM15_SHOP_START 574+#define CLIP_VM15_TALK_END 575+#define CLIP_VM15_TALK_START 576+#define CLIP_VM16_CRY 577+#define CLIP_VM16_CRY_TURN 578+#define CLIP_VM16_FREED 579+#define CLIP_VM16_HOME_BOUNCE 580+#define CLIP_VM16_HOME_WAVE 581+#define CLIP_VM16_IDLE 582+#define CLIP_VM17_CRUMBLE 583+#define CLIP_VM17_IDLE 584+#define CLIP_VM18_BECKON 585+#define CLIP_VM18_CHEER 586+#define CLIP_VM18_CRY 587+#define CLIP_VM18_GIFT 588+#define CLIP_VM18_IDLE 589+#define CLIP_VM20_RIPPLE_WATER 590+#define CLIP_ANIM0_STAG_DOOR_OPEN00 591+#define CLIP_ANIM1_DASH_CLOAK_CORPSE000 592+#define CLIP_ANIM2_GROUND_PLINK_0 593+#define CLIP_ANIM3_FIREBALL_COLLECT_ANIM 594+#define SPRITE_HERO_LIGHT 2931+#define SPRITE_DIALOGUE_BACKBOARD 2932+#define SPRITE_PROMPT_SHADOW 2933+#define SPRITE_CORPSE_NAIL 2934+#define SPRITE_FK_BARREL 2935+#define SPRITE_FK_STAFF 2936+#define SPRITE_DIGIT0 3357#define STYLE_DIALOGUE 0#define STYLE_PROMPT 1#define STYLE_TITLE_L 2@@ -705,20 +707,20 @@#define EK_HORNET 29#define NUM_KINDS 30#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 200, 199, -1, -1, -1, -1, -1, -1, -1, -1, 202, 203}}, {EF_BUZZER, {205, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 207, 208}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 215, 214, -1, -1, -1, -1, -1, -1, -1, 212, 213}}, {EF_BOUNCER, {-1, -1, -1, 218, -1, -1, -1, -1, -1, -1, -1, 216, 217}}, {EF_SPITTER, {-1, -1, -1, 221, 222, 220, -1, -1, -1, -1, -1, 219, -1}}, {EF_ROLLER, {225, -1, -1, 227, 226, 228, -1, -1, -1, -1, -1, 223, 224}}, {EF_BLOCKER, {235, -1, -1, 231, 236, 229, 230, 237, 238, 234, 233, -1, 232}}, {EF_HUSK, {244, 245, 246, 239, 241, 240, -1, -1, -1, -1, -1, 242, 243}}, {EF_HUSK, {252, 253, 254, 247, 249, 248, -1, -1, -1, -1, -1, 250, 251}}, {EF_HUSK, {260, 261, 262, 255, 257, 256, -1, -1, -1, -1, -1, 258, 259}}, {EF_HUSK, {268, 269, 270, 263, 265, 264, -1, -1, -1, -1, -1, 266, 267}}, {EF_LEAPER, {274, 276, 277, 271, 275, -1, -1, -1, -1, -1, -1, 272, 273}}, {EF_GUARD, {283, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 280, 281}}, {EF_FK, {305, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 303}}, {EF_FKHEAD, {325, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 323}}, {EF_HATCHER, {-1, -1, -1, 330, 329, -1, -1, -1, -1, -1, -1, 327, 328}}, {EF_HATCHLING, {-1, -1, -1, 331, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {337, -1, -1, 335, 336, 339, 338, 332, -1, -1, -1, 333, 334}}, {EF_GFLY, {352, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 361, 362, 360, 356, 357, -1, -1, -1, -1, -1, 358, 359}}, {EF_PIGEON, {-1, -1, -1, 364, 365, 366, 363, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {368, -1, -1, 371, 370, 369, -1, -1, -1, -1, -1, 367, -1}}, {EF_SHAKER, {375, 376, 377, 372, -1, -1, -1, -1, -1, -1, -1, 373, 374}}, {EF_MOSQUITO, {382, -1, -1, 384, 383, 379, 378, -1, -1, -1, -1, 380, 381}}, {EF_FATFLY, {388, -1, -1, 385, -1, -1, -1, -1, -1, -1, -1, 386, 387}}, {EF_MOSSCHARGER, {-1, -1, -1, 389, 390, 393, 396, 395, 397, 394, -1, 391, 392}}, {EF_MOSSKNIGHT, {403, 418, 422, -1, -1, -1, -1, -1, -1, -1, -1, 398, 399}}, {EF_HORNET, {438, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 426, -1}}}-#define TXT_PROMPT_LISTEN 90-#define TXT_PROMPT_REST 91-#define TXT_PROMPT_INSPECT 92-#define TXT_PROMPT_ENTER 93-#define TXT_PROMPT_SIT 94-#define TXT_PROMPT_SHOP 95-#define TXT_PROMPT_TRAVEL 96-#define TXT_PROMPT_ASCEND 97-#define TXT_PROMPT_DESCEND 98-#define TXT_PROMPT_EXIT 99-#define TXT_PROMPT_ACCEPT 100-#define TXT_PROMPT_TRADE 101-#define TXT_PROMPT_WATCH 102-#define TXT_PROMPT_CHALLENGE 103+#define TXT_PROMPT_LISTEN 91+#define TXT_PROMPT_REST 92+#define TXT_PROMPT_INSPECT 93+#define TXT_PROMPT_ENTER 94+#define TXT_PROMPT_SIT 95+#define TXT_PROMPT_SHOP 96+#define TXT_PROMPT_TRAVEL 97+#define TXT_PROMPT_ASCEND 98+#define TXT_PROMPT_DESCEND 99+#define TXT_PROMPT_EXIT 100+#define TXT_PROMPT_ACCEPT 101+#define TXT_PROMPT_TRADE 102+#define TXT_PROMPT_WATCH 103+#define TXT_PROMPT_CHALLENGE 104#define PROMPT_SORT 884737u#define DIGIT_ADV {0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f, 0.4182f}#define VMOP_NOP 1@@ -746,105 +748,107 @@#define VMOP_INTCOMPARETOBOOL 23#define VMOP_INTADD 24#define VMOP_INTSWITCH 25-#define VMOP_BOOLTEST 26-#define VMOP_BOOLALLTRUE 27-#define VMOP_BOOLANYTRUE 28-#define VMOP_BOOLTESTMULTI 29-#define VMOP_STRINGCOMPARE 30-#define VMOP_GETPLAYERDATABOOL 31-#define VMOP_SETPLAYERDATABOOL 32-#define VMOP_PLAYERDATABOOLTEST 33-#define VMOP_PLAYERDATABOOLTRUEANDFALSE 34-#define VMOP_GETPLAYERDATAINT 35-#define VMOP_SETPLAYERDATAINT 36-#define VMOP_ACTIVATEGAMEOBJECT 37-#define VMOP_SETSPRITERENDERER 38-#define VMOP_SETMESHRENDERER 39-#define VMOP_SETCOLLIDER 40-#define VMOP_DESTROYOBJECT 41-#define VMOP_DESTROYSELF 42-#define VMOP_DESTROYALLCHILDREN 43-#define VMOP_GETPOSITION 44-#define VMOP_SETPOSITION 45-#define VMOP_GETSCALE 46-#define VMOP_SETSCALE 47-#define VMOP_SETVELOCITY2D 48-#define VMOP_SETGRAVITY2DSCALE 49-#define VMOP_CHECKTARGETDIRECTION 50-#define VMOP_FACEOBJECT 51-#define VMOP_TK2DPLAYANIMATION 52-#define VMOP_TK2DPLAYANIMATIONWITHEVENTS 53-#define VMOP_TK2DWATCHANIMATIONEVENTS 54-#define VMOP_TK2DPLAYFRAME 55-#define VMOP_TK2DSPRITEGETID 56-#define VMOP_TRIGGER2DEVENT 57-#define VMOP_LISTENFORUP 58-#define VMOP_LISTENFORDOWN 59-#define VMOP_LISTENFORLEFT 60-#define VMOP_LISTENFORRIGHT 61-#define VMOP_LISTENFORATTACK 62-#define VMOP_LISTENFORJUMP 63-#define VMOP_LISTENFORCAST 64-#define VMOP_CHECKTRACKTRIGGERCOUNT 65-#define VMOP_SHOWPROMPTMARKER 66-#define VMOP_HIDEPROMPTMARKER 67-#define VMOP_SETFSMBOOL 68-#define VMOP_SETFSMSTRING 69-#define VMOP_STARTCONVERSATION 70-#define VMOP_HEROCALL 71-#define VMOP_SHAKE 72-#define VMOP_SETRUMBLE 73-#define VMOP_EASEFLOAT 74-#define VMOP_CAMERAZOOM 75-#define VMOP_COLLISION2DEVENT 76-#define VMOP_HUDBLANKER 77-#define VMOP_CREATEOBJECT 78-#define VMOP_GETITEMMSG 79-#define VMOP_BLANKER 80-#define VMOP_BLANKERON 81-#define VMOP_FINDGAMEOBJECT 82-#define VMOP_SETPARENT 83-#define VMOP_INTOP 84-#define VMOP_ACTIVATEALLCHILDREN 85-#define VMOP_ITWEENMOVEBY 86-#define VMOP_SETFSMFLOAT 87-#define VMOP_TEXTALIGN 88-#define VMOP_OBJALPHA 89-#define VMOP_BUILDSTRING 90-#define VMOP_STARTCONVERSATIONOF 91-#define VMOP_NOTICEICON 92-#define VMOP_NOTICETEXT 93-#define VMOP_CHARMNOTICE 94-#define VMOP_CHARMTUTE 95-#define VMOP_GETOBJALPHA 96-#define VMOP_FLINGOBJECT 97-#define VMOP_GETSPEED2D 98-#define VMOP_SENDRANDOMEVENT 99-#define VMOP_INTTOSTRING 100-#define VMOP_FLINGGEO 101-#define VMOP_INCREMENTPLAYERDATAINT 102-#define VMOP_LISTENFORINVENTORY 103-#define VMOP_WAITRANDOM 104-#define VMOP_FLINGPIECE 105-#define VMOP_STARTCONVERSATIONYN 106-#define VMOP_SETTOLL 107-#define VMOP_SETYNREQUESTER 108-#define VMOP_SENDEVENTOF 109-#define VMOP_HUDSLIDE 110-#define VMOP_OPENSTAGMENU 111-#define VMOP_SETNEXTSCENE 112-#define VMOP_STAGTRAVEL 113-#define VMOP_TRANSLATE 114-#define VMOP_HEROCOLLISION 115-#define VMOP_PLATFORMSTICK 116-#define VMOP_WAITFORHEROINPOSITION 117-#define VMOP_SENDTRIGGER2DEVENT 118-#define VMOP_FREEZEMOMENT 119-#define VMOP_DAMAGERINFO 120-#define VMOP_INTOPERATOR 121-#define VMOP_GETDISTANCE 122-#define VMOP_SOULORBS 123-#define VMOP_FADETO 124+#define VMOP_FLOATSWITCH 26+#define VMOP_BOOLTEST 27+#define VMOP_BOOLALLTRUE 28+#define VMOP_BOOLANYTRUE 29+#define VMOP_BOOLTESTMULTI 30+#define VMOP_STRINGCOMPARE 31+#define VMOP_GETPLAYERDATABOOL 32+#define VMOP_SETPLAYERDATABOOL 33+#define VMOP_PLAYERDATABOOLTEST 34+#define VMOP_PLAYERDATABOOLTRUEANDFALSE 35+#define VMOP_GETPLAYERDATAINT 36+#define VMOP_SETPLAYERDATAINT 37+#define VMOP_ACTIVATEGAMEOBJECT 38+#define VMOP_SETSPRITERENDERER 39+#define VMOP_SETMESHRENDERER 40+#define VMOP_SETCOLLIDER 41+#define VMOP_DESTROYOBJECT 42+#define VMOP_DESTROYSELF 43+#define VMOP_DESTROYALLCHILDREN 44+#define VMOP_GETPOSITION 45+#define VMOP_SETPOSITION 46+#define VMOP_GETSCALE 47+#define VMOP_SETSCALE 48+#define VMOP_SETVELOCITY2D 49+#define VMOP_SETGRAVITY2DSCALE 50+#define VMOP_CHECKTARGETDIRECTION 51+#define VMOP_FACEOBJECT 52+#define VMOP_TK2DPLAYANIMATION 53+#define VMOP_TK2DPLAYANIMATIONWITHEVENTS 54+#define VMOP_TK2DWATCHANIMATIONEVENTS 55+#define VMOP_TK2DPLAYFRAME 56+#define VMOP_TK2DSPRITEGETID 57+#define VMOP_TRIGGER2DEVENT 58+#define VMOP_LISTENFORUP 59+#define VMOP_LISTENFORDOWN 60+#define VMOP_LISTENFORLEFT 61+#define VMOP_LISTENFORRIGHT 62+#define VMOP_LISTENFORATTACK 63+#define VMOP_LISTENFORJUMP 64+#define VMOP_LISTENFORCAST 65+#define VMOP_CHECKTRACKTRIGGERCOUNT 66+#define VMOP_SHOWPROMPTMARKER 67+#define VMOP_HIDEPROMPTMARKER 68+#define VMOP_SETFSMBOOL 69+#define VMOP_SETFSMSTRING 70+#define VMOP_STARTCONVERSATION 71+#define VMOP_HEROCALL 72+#define VMOP_SHAKE 73+#define VMOP_SETRUMBLE 74+#define VMOP_EASEFLOAT 75+#define VMOP_CAMERAZOOM 76+#define VMOP_COLLISION2DEVENT 77+#define VMOP_HUDBLANKER 78+#define VMOP_CREATEOBJECT 79+#define VMOP_GETITEMMSG 80+#define VMOP_BLANKER 81+#define VMOP_BLANKERON 82+#define VMOP_FINDGAMEOBJECT 83+#define VMOP_SETPARENT 84+#define VMOP_INTOP 85+#define VMOP_ACTIVATEALLCHILDREN 86+#define VMOP_ITWEENMOVEBY 87+#define VMOP_SETFSMFLOAT 88+#define VMOP_TEXTALIGN 89+#define VMOP_OBJALPHA 90+#define VMOP_BUILDSTRING 91+#define VMOP_STARTCONVERSATIONOF 92+#define VMOP_NOTICEICON 93+#define VMOP_NOTICETEXT 94+#define VMOP_CHARMNOTICE 95+#define VMOP_CHARMTUTE 96+#define VMOP_GETOBJALPHA 97+#define VMOP_FLINGOBJECT 98+#define VMOP_GETSPEED2D 99+#define VMOP_SENDRANDOMEVENT 100+#define VMOP_INTTOSTRING 101+#define VMOP_FLINGGEO 102+#define VMOP_INCREMENTPLAYERDATAINT 103+#define VMOP_LISTENFORINVENTORY 104+#define VMOP_WAITRANDOM 105+#define VMOP_FLINGPIECE 106+#define VMOP_STARTCONVERSATIONYN 107+#define VMOP_SETTOLL 108+#define VMOP_SETYNREQUESTER 109+#define VMOP_SENDEVENTOF 110+#define VMOP_HUDSLIDE 111+#define VMOP_OPENSTAGMENU 112+#define VMOP_SETNEXTSCENE 113+#define VMOP_STAGTRAVEL 114+#define VMOP_TRANSLATE 115+#define VMOP_HEROCOLLISION 116+#define VMOP_PLATFORMSTICK 117+#define VMOP_WAITFORHEROINPOSITION 118+#define VMOP_SENDTRIGGER2DEVENT 119+#define VMOP_FREEZEMOMENT 120+#define VMOP_DAMAGERINFO 121+#define VMOP_INTOPERATOR 122+#define VMOP_GETDISTANCE 123+#define VMOP_SOULORBS 124+#define VMOP_FADETO 125+#define VMOP_SETBENCHRESPAWN 126#define VMEV_FINISHED 0#define VMEV_CONVO_FINISH 1#define VMEV_CONVO_START 2@@ -885,11 +889,13 @@#define VMEV_NO 37#define VMEV_CONTINUE 38#define VMEV_RESET 39+#define VMEV_HIT 40+#define VMEV_UNCOVER 41#define VMSTR_NPC_TITLE 14-#define VMSTR_VISITED 526-#define VMSTR_DISPLAY_RIGHT 527-#define VMSTR_HORNET_SAVER 196-#define VMSTR_ITEM 438+#define VMSTR_VISITED 578+#define VMSTR_DISPLAY_RIGHT 579+#define VMSTR_HORNET_SAVER 201+#define VMSTR_ITEM 492#define STR_ATTACK_RANGE 23#define STR_EVADE_RANGE 49#define STR_SPIT_RANGE 50@@ -918,69 +924,69 @@#define TITLE_TISO_NC 18#define TITLE_CHARM_SLUG 19#define NUM_TITLES 20-#define TITLE_TABLE {{104, 105, -1, -1}, {106, 107, 108, -1}, {109, 110, -1, 111}, {112, 113, -1, 114}, {115, 116, -1, 117}, {118, 119, -1, -1}, {120, 121, 122, -1}, {123, 124, -1, -1}, {125, 126, -1, -1}, {127, 128, -1, -1}, {129, 130, -1, -1}, {131, 132, -1, -1}, {133, 134, -1, -1}, {135, 136, -1, -1}, {137, 138, -1, 139}, {140, 141, -1, 142}, {140, 141, -1, 143}, {144, 145, 146, -1}, {144, 145, -1, -1}, {147, 148, -1, 149}}-#define SPRITE_FLEUR_TOP 2864+#define TITLE_TABLE {{105, 106, -1, -1}, {107, 108, 109, -1}, {110, 111, -1, 112}, {113, 114, -1, 115}, {116, 117, -1, 118}, {119, 120, -1, -1}, {121, 122, 123, -1}, {124, 125, -1, -1}, {126, 127, -1, -1}, {128, 129, -1, -1}, {130, 131, -1, -1}, {132, 133, -1, -1}, {134, 135, -1, -1}, {136, 137, -1, -1}, {138, 139, -1, 140}, {141, 142, -1, 143}, {141, 142, -1, 144}, {145, 146, 147, -1}, {145, 146, -1, -1}, {148, 149, -1, 150}}+#define SPRITE_FLEUR_TOP 2937#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 2865+#define SPRITE_FLEUR_BOT 2938#define FLEUR_BOT_RECTS {{0.000f, 0.000f, 0.016f, 0.016f}, {0.000f, 0.000f, 0.016f, 0.016f}, {0.391f, 0.406f, 0.828f, 0.844f}, {-1.063f, 0.281f, 1.516f, 1.016f}, {-1.594f, -0.047f, 2.109f, 1.031f}, {-1.984f, -0.156f, 2.375f, 1.047f}, {-2.531f, -0.438f, 2.719f, 1.172f}, {-2.688f, -0.594f, 2.766f, 1.188f}, {-2.797f, -0.797f, 3.156f, 1.219f}, {-3.078f, -0.938f, 3.219f, 1.219f}, {-3.250f, -1.156f, 3.438f, 1.219f}, {-3.250f, -1.172f, 3.828f, 1.219f}, {-3.781f, -1.188f, 4.203f, 1.234f}, {-3.984f, -1.188f, 4.344f, 1.234f}, {-4.281f, -1.203f, 4.562f, 1.234f}, {-4.406f, -1.203f, 4.641f, 1.234f}, {-4.578f, -1.219f, 4.719f, 1.234f}, {-4.656f, -1.219f, 4.719f, 1.234f}, {-4.734f, -1.219f, 4.734f, 1.234f}, {-4.750f, -1.234f, 4.734f, 1.234f}, {-4.766f, -1.234f, 4.734f, 1.250f}, {-4.766f, -1.234f, 4.734f, 1.250f}}-#define SPRITE_MSG_BG 2866-#define SPRITE_MSG_STOP 2867-#define SPRITE_MSG_FLEUR 2868-#define SPRITE_MSG_KEY 2869-#define SPRITE_MSG_ICON_FIREBALL 2870-#define SPRITE_MSG_ICON_DASH 2871-#define SPRITE_GRASS_BALL 2872-#define SPRITE_SOUL_ORB 2873+#define SPRITE_MSG_BG 2939+#define SPRITE_MSG_STOP 2940+#define SPRITE_MSG_FLEUR 2941+#define SPRITE_MSG_KEY 2942+#define SPRITE_MSG_ICON_FIREBALL 2943+#define SPRITE_MSG_ICON_DASH 2944+#define SPRITE_GRASS_BALL 2945+#define SPRITE_SOUL_ORB 2946#define SOUL_ORB_SORT {13, 0}-#define MSG_TABLE {{150, 151, 152, 153, 154, 155}, {156, 157, 158, 159, 160, 161}}-#define NOTICE_BACKBOARD {2874, 1.0000f, 0.6931f}-#define TUTE_FLEUR {2868, 1.0000f, 1.0000f}-#define TUTE_BACKBOARD {2875, 1.0000f, 0.9560f}-#define TUTE_IMAGE {2876, 1.0000f, 1.0000f}-#define TUTE_STOP {2867, 1.0000f, 1.0000f}-#define NOTICE_ICONS {2877, 2878, 2879}+#define MSG_TABLE {{151, 152, 153, 154, 155, 156}, {157, 158, 159, 160, 161, 162}}+#define NOTICE_BACKBOARD {2947, 1.0000f, 0.6931f}+#define TUTE_FLEUR {2941, 1.0000f, 1.0000f}+#define TUTE_BACKBOARD {2948, 1.0000f, 0.9560f}+#define TUTE_IMAGE {2949, 1.0000f, 1.0000f}+#define TUTE_STOP {2940, 1.0000f, 1.0000f}+#define NOTICE_ICONS {2950, 2951, 2952}#define CHARM_ICON_K 1.5000f-#define CHARM_ICONS {-1, 2880, 2881, 2882, 2883, -1, 2884, 2885, 2886, -1, -1, -1, -1, -1, 2887, -1, -1, -1, 2888, 2889, 2890, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define CHARM_NAMES {-1, 162, 163, 164, 165, -1, 166, 167, 168, -1, -1, -1, -1, -1, 169, -1, -1, -1, 170, 171, 172, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define TXT_CHARM_TUTE_TITLE 173-#define TXT_CHARM_TUTE_SUB 174-#define TXT_CHARM_REMINDER 175-#define TXT_YN_YES 176-#define TXT_YN_NO 177-#define TXT_YN_NOT_ENOUGH 178-#define MENU_LOGO {2891, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CHARM_ICONS {-1, 2953, 2954, 2955, 2956, -1, 2957, 2958, 2959, -1, -1, -1, -1, -1, 2960, -1, -1, -1, 2961, 2962, 2963, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CHARM_NAMES {-1, 163, 164, 165, 166, -1, 167, 168, 169, -1, -1, -1, -1, -1, 170, -1, -1, -1, 171, 172, 173, -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 174+#define TXT_CHARM_TUTE_SUB 175+#define TXT_CHARM_REMINDER 176+#define TXT_YN_YES 177+#define TXT_YN_NO 178+#define TXT_YN_NOT_ENOUGH 179+#define MENU_LOGO {2964, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_LOGO_Y 3.6585f#define MENU_START_Y -1.4181f#define MENU_QUIT_Y -2.3582f-#define MENU_POINTER {2892, 0.0000f, 0.0000f, 1.0023f, 1.0000f}+#define MENU_POINTER {2965, 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 {2893, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_PROFILES_FLEUR {2966, 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, {2894, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2895, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2896, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2897, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2898, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}+#define MENU_SLOT_ZONES {{2, {2967, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2968, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2969, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2970, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2971, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}#define MENU_SLOT_NZONES 5#define MENU_SLOT_BG_DY 0.0102f-#define MENU_SLOT_FLEUR {2899, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_FLEUR {2972, 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 {2900, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_SELECTOR {2973, 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 {2901, 0.0000f, 0.0000f, 1.0000f, 1.0025f}+#define MENU_SLOT_CURSOR {2974, 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 {2902, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_ORB {2975, 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 {2903, 0.0000f, 0.0000f, 1.0039f, 1.0000f}+#define MENU_SLOT_GEO {2976, 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 {2904, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_HEALTH {2977, 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@@ -998,60 +1004,60 @@#define MENU_SLOT_YES_X 2.5813f#define MENU_SLOT_NO_X 6.2296f#define MENU_BACK_Y -5.5406f-#define MENU_PAUSE_TOP {2905, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_TOP {2978, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_TOP_Y 2.3653f-#define MENU_PAUSE_BOT {2906, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_BOT {2979, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_BOT_Y -1.8877f#define MENU_PAUSE_CONTINUE_Y 0.6428f#define MENU_PAUSE_QUIT_Y -0.4548f-#define TXT_MAIN_START 179-#define TXT_MAIN_QUIT 180-#define TXT_PROFILE_NEW_GAME 181-#define TXT_PROFILE_CLEAR_BUTTON 182-#define TXT_PROFILE_CLEAR_PROMPT 183-#define TXT_NAV_YES 184-#define TXT_NAV_NO 185-#define TXT_NAV_BACK 186-#define TXT_PAUSE_CONTINUE 187-#define TXT_PAUSE_MAIN 188-#define TXT_PROFILE_CORRUPTED 189-#define TXT_SCREEN_SAVE_PROFILES 190-#define TXT_ZONES {191, 192, 193, 194, 195}+#define TXT_MAIN_START 180+#define TXT_MAIN_QUIT 181+#define TXT_PROFILE_NEW_GAME 182+#define TXT_PROFILE_CLEAR_BUTTON 183+#define TXT_PROFILE_CLEAR_PROMPT 184+#define TXT_NAV_YES 185+#define TXT_NAV_NO 186+#define TXT_NAV_BACK 187+#define TXT_PAUSE_CONTINUE 188+#define TXT_PAUSE_MAIN 189+#define TXT_PROFILE_CORRUPTED 190+#define TXT_SCREEN_SAVE_PROFILES 191+#define TXT_ZONES {192, 193, 194, 195, 196}#define INV_X -4.0500f#define INV_Y 7.5500f-#define INV_BORDER {{2907, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2907, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2908, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2909, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2910, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2911, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}+#define INV_BORDER {{2980, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2980, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2981, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2982, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2983, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2984, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}#define INV_NBORDER 6-#define INV_FRAME {2912, 4.0479f, -7.1963f, 1.0f, 1.0f}-#define INV_ARROW_L {2913, -9.8300f, -7.2000f, 1.0000f, 1.0000f}-#define INV_ARROW_R {2913, 18.0300f, -7.2000f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_L {2914, -9.8600f, -0.4300f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_R {2914, 18.0400f, -0.4300f, 1.0000f, 1.0000f}+#define INV_FRAME {2985, 4.0479f, -7.1963f, 1.0f, 1.0f}+#define INV_ARROW_L {2986, -9.8300f, -7.2000f, 1.0000f, 1.0000f}+#define INV_ARROW_R {2986, 18.0300f, -7.2000f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_L {2987, -9.8600f, -0.4300f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_R {2987, 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 {198, 199, 200, 201}-#define CH_BB {2915, -7.9200f, -8.3700f, 1.0000f, 1.0000f}+#define TXT_INV_PANES {199, 200, 201, 202}+#define CH_BB {2988, -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 {2916, 0.0500f, 0.0600f, 1.0000f, 0.9919f}+#define CH_GLOW {2989, 0.0500f, 0.0600f, 1.0000f, 0.9919f}#define CH_GLOW_A 0.6970f-#define CH_ICONS {-1, 2880, 2881, 2882, 2883, -1, 2884, 2885, 2886, -1, -1, -1, -1, -1, 2887, -1, -1, -1, 2888, 2889, 2890, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define CH_NEXT_DOT {2917, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_ICONS {-1, 2953, 2954, 2955, 2956, -1, 2957, 2958, 2959, -1, -1, -1, -1, -1, 2960, -1, -1, -1, 2961, 2962, 2963, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CH_NEXT_DOT {2990, 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 {2918, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define CH_NOTCH_EMPTY {2919, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_FULL {2991, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_EMPTY {2992, 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 {2920, -0.8400f, -6.9300f, 1.0000f, 0.1591f}+#define CH_DIVIDER {2993, -0.8400f, -6.9300f, 1.0000f, 0.1591f}#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}-#define CH_COST_PIP {2918, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_COST_PIP {2991, 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@@ -1060,59 +1066,59 @@#define CH_NAME {12.4800f, -2.2710f, 8.8867f}#define CH_DESC {8.0382f, -7.3673f, 8.8867f}#define CH_CONFIRM {15.7465f, -13.0221f, 15.3500f}-#define CH_CONFIRM_KEY {2921, 16.3208f, -13.2878f, 1.0f, 1.0f}+#define CH_CONFIRM_KEY {2994, 16.3208f, -13.2878f, 1.0f, 1.0f}#define CH_CONFIRM_KEY_W 0.6412f-#define CH_CURSOR {2922, 0.0000f, 0.0000f, 1.0000f, 0.9756f}+#define CH_CURSOR {2995, 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 202-#define TXT_CHARM_TXT_OVERCHARMED 203-#define TXT_CHARM_TXT_COST 204-#define TXT_CTRL_EQUIP 205-#define TXT_CTRL_UNEQUIP 206-#define TXT_CHARM_ALERT_NONE 207-#define TXT_CHARM_ALERT_NONE_BENCH 208-#define TXT_CHARM_NOTCHES 209-#define TXT_CHARM_NAMES_INV {-1, 210, 211, 212, 213, -1, 214, 215, 216, -1, -1, -1, -1, -1, 217, -1, -1, -1, 218, 219, 220, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define TXT_CHARM_DESCS {-1, 221, 222, 223, 224, -1, 225, 226, 227, -1, -1, -1, -1, -1, 228, -1, -1, -1, 229, 230, 231, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define TXT_KEY_OK 232-#define INV_FIXED {{2923, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2924, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2925, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2926, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2927, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2928, -5.7200f, -13.3200f, 1.0000f, 1.0000f}}-#define INV_FIXED_BG {{-1, 0, 0, 0, 0}, {-1, 0, 0, 0, 0}, {-1, 0, 0, 0, 0}, {2929, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2930, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}+#define TXT_CHARM_TXT_EQUIPPED 203+#define TXT_CHARM_TXT_OVERCHARMED 204+#define TXT_CHARM_TXT_COST 205+#define TXT_CTRL_EQUIP 206+#define TXT_CTRL_UNEQUIP 207+#define TXT_CHARM_ALERT_NONE 208+#define TXT_CHARM_ALERT_NONE_BENCH 209+#define TXT_CHARM_NOTCHES 210+#define TXT_CHARM_NAMES_INV {-1, 211, 212, 213, 214, -1, 215, 216, 217, -1, -1, -1, -1, -1, 218, -1, -1, -1, 219, 220, 221, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define TXT_CHARM_DESCS {-1, 222, 223, 224, 225, -1, 226, 227, 228, -1, -1, -1, -1, -1, 229, -1, -1, -1, 230, 231, 232, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define TXT_KEY_OK 233+#define INV_FIXED {{2996, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2997, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2998, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2999, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {3000, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {3001, -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}, {3002, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {3003, -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 {{2931, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2932, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2933, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2934, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}-#define INV_VESSEL_PIECES {{2935, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2936, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2937, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}+#define INV_HEART_PIECES {{3004, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3005, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3006, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3007, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}+#define INV_VESSEL_PIECES {{3008, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {3009, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {3010, -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 {{2938, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2939, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2940, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2941, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2942, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2943, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}+#define INV_EQ {{3011, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3012, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3013, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3014, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3015, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3016, 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 {{2944, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2945, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2946, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2947, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}+#define INV_TRINKETS {{3017, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {3018, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {3019, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {3020, 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 {2948, 4.2400f, -10.8700f, 1.0000f, 1.0000f}-#define INV_DIVIDERS {{2949, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2949, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}+#define INV_TRINKET_BB {3021, 4.2400f, -10.8700f, 1.0000f, 1.0000f}+#define INV_DIVIDERS {{3022, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {3022, 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 {{233, 234}, {235, 236}, {237, 238}, {235, 239}, {235, 240}, {241, 242}}-#define TXT_INV_VESSEL {{233, 234}, {243, 244}, {245, 246}, {243, 247}, {248, 249}}-#define TXT_INV_FIXED {{250, 251}, {252, 253}, {254, 255}, {256, 257}}-#define TXT_INV_EQ {{258, 259}, {260, 261}, {262, 263}, {264, 265}, {266, 267}, {268, 269}}-#define TXT_INV_QUILL {270, 271, 272, 273}-#define TXT_INV_TRINKETS {{274, 275}, {276, 277}, {278, 279}, {280, 281}}-#define SHOP_BACKBOARD {2950, 4.9000f, -0.3200f, 0.8667f, 1.0000f}-#define SHOP_MASK_TOP {2951, 5.1230f, 4.8800f, 1.0000f, 0.9013f}-#define SHOP_MASK_BOTTOM {2952, 5.1537f, -5.6200f, 1.0000f, 0.8820f}-#define SHOP_ARROW_U {2953, 1.7000f, 1.8900f, 1.0000f, 1.0000f}-#define SHOP_ARROW_D {2953, 1.7000f, -0.3800f, -1.0000f, 1.0000f}-#define SHOP_SELECTOR {2954, 1.7300f, 0.7600f, 0.9332f, 1.0000f}-#define SHOP_CONFIRM_GEO {2955, 4.2800f, 0.3400f, 1.0000f, 1.0000f}-#define SHOP_POINTER_L {2956, 3.6119f, -2.0798f, 1.0000f, 1.0000f}-#define SHOP_POINTER_R {2956, 6.6249f, -2.0798f, -1.0000f, 1.0000f}+#define TXT_INV_HEART {{234, 235}, {236, 237}, {238, 239}, {236, 240}, {236, 241}, {242, 243}}+#define TXT_INV_VESSEL {{234, 235}, {244, 245}, {246, 247}, {244, 248}, {249, 250}}+#define TXT_INV_FIXED {{251, 252}, {253, 254}, {255, 256}, {257, 258}}+#define TXT_INV_EQ {{259, 260}, {261, 262}, {263, 264}, {265, 266}, {267, 268}, {269, 270}}+#define TXT_INV_QUILL {271, 272, 273, 274}+#define TXT_INV_TRINKETS {{275, 276}, {277, 278}, {279, 280}, {281, 282}}+#define SHOP_BACKBOARD {3023, 4.9000f, -0.3200f, 0.8667f, 1.0000f}+#define SHOP_MASK_TOP {3024, 5.1230f, 4.8800f, 1.0000f, 0.9013f}+#define SHOP_MASK_BOTTOM {3025, 5.1537f, -5.6200f, 1.0000f, 0.8820f}+#define SHOP_ARROW_U {3026, 1.7000f, 1.8900f, 1.0000f, 1.0000f}+#define SHOP_ARROW_D {3026, 1.7000f, -0.3800f, -1.0000f, 1.0000f}+#define SHOP_SELECTOR {3027, 1.7300f, 0.7600f, 0.9332f, 1.0000f}+#define SHOP_CONFIRM_GEO {3028, 4.2800f, 0.3400f, 1.0000f, 1.0000f}+#define SHOP_POINTER_L {3029, 3.6119f, -2.0798f, 1.0000f, 1.0000f}+#define SHOP_POINTER_R {3029, 6.6249f, -2.0798f, -1.0000f, 1.0000f}#define SHOP_MASK_A {0, 0, 255, 255, 255, 255, 255, 254, 249, 230, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 81, 134, 182, 206, 226, 223, 0, 0, 0, 0, 0, 0}#define SHOP_CONFIRM_ITEM {5.0900f, 2.4700f}-#define TXT_KEY_BACK 283+#define TXT_KEY_BACK 284#define SHOP_BACKBOARD_A 0.8910f#define SHOP_BORDERS {{5.1437f, 3.6600f, 1.1244f, 1.0000f, CLIP_SHOPUI_SHOP_MENU_TOP_UP, CLIP_SHOPUI_SHOP_MENU_TOP_DOWN, 0.0000f}, {5.1937f, -5.7000f, 1.1338f, 1.0000f, CLIP_SHOPUI_SHOP_MENU_BOTTOM_UP, CLIP_SHOPUI_SHOP_MENU_BOTTOM_DOWN, 0.0000f}}#define SHOP_FIGUREHEADS {{5.1437f, 6.6400f, 1.0000f, 1.0000f, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_UP, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_DOWN, 0.3500f}, {5.1437f, 6.7400f, 1.0000f, 1.0000f, CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_UP, CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_DOWN, 0.3500f}, {5.1437f, 6.8300f, 1.0000f, 1.0000f, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_UP, CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_DOWN, 0.3500f}}@@ -1129,7 +1135,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 {2957, 5.5100f, 2.5800f, 1.0000f, 1.0000f}+#define SHOP_PEG {3030, 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}@@ -1140,24 +1146,24 @@#define SHOP_ROW_TOP 4.9000f#define SHOP_ROW_BOTTOM -5.2500f#define SHOP_ARROW_BOB 0.1500f-#define TXT_SHOP_CTRL_BUY 286-#define TXT_SHOP_CTRL_EXIT 287-#define TXT_SHOP_CTRL_CONFIRM 288-#define TXT_SHOP_CTRL_CANCEL 289-#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 290-#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 291-#define TXT_SHOP_CHARM_TXT_NOTCHCOST 292-#define TXT_SHOP_YES 293-#define TXT_SHOP_NO 294+#define TXT_SHOP_CTRL_BUY 287+#define TXT_SHOP_CTRL_EXIT 288+#define TXT_SHOP_CTRL_CONFIRM 289+#define TXT_SHOP_CTRL_CANCEL 290+#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 291+#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 292+#define TXT_SHOP_CHARM_TXT_NOTCHCOST 293+#define TXT_SHOP_YES 294+#define TXT_SHOP_NO 295#define SHOP_DESC_BOTTOM -5.0500f-#define SHOP_ITEMS {{2959, 0.5714f, 295, 296, 150, 1, 125, -1, 0, 0}, {2959, 0.5714f, 295, 297, 500, 1, 126, 125, 0, 0}, {2960, 0.5714f, 298, 299, 550, 3, 127, -1, 0, 0}, {2961, 0.5714f, 300, 301, 950, 10, 128, -1, 0, 0}, {2962, 0.5714f, 302, 303, 300, 2, 37, -1, 0, 1}, {2963, 0.5714f, 304, 305, 200, 2, 40, -1, 0, 4}, {2964, 0.5714f, 306, 307, 1800, 0, 119, -1, 0, 0}, {2965, 0.5714f, 308, 309, 60, 11, 129, -1, 0, 0}, {2966, 0.5714f, 310, 311, 220, 2, 38, -1, 0, 2}, {2967, 0.5714f, 312, 313, 120, 0, 2, -1, 0, 0}, {2968, 0.5714f, 314, 315, 40, 9, 130, 10, 0, 0}, {2968, 0.5714f, 316, 317, 80, 9, 131, 28, 0, 0}, {2969, 0.5714f, 318, 319, 100, 16, 133, -1, 0, 0}, {2970, 0.5714f, 320, 321, 100, 16, 134, -1, 0, 0}, {2971, 0.5714f, 322, 323, 100, 16, 135, -1, 0, 0}, {2972, 0.5714f, 324, 325, 100, 16, 137, 147, 0, 0}, {2973, 0.5714f, 326, 327, 100, 16, 136, -1, 0, 0}, {2974, 0.5714f, 328, 329, 100, 17, 139, -1, 0, 0}, {2975, 0.5714f, 330, 331, 100, 17, 140, -1, 0, 0}, {2976, 0.5714f, 332, 333, 100, 17, 141, 14, 0, 0}, {2977, 0.5714f, 334, 335, 210, 17, 142, 14, 0, 0}, {2978, 0.5714f, 336, 337, 250, 2, 44, -1, 0, 8}, {2979, 0.5714f, 338, 339, 300, 2, 54, -1, 0, 18}, {2980, 0.5714f, 340, 341, 120, 2, 50, -1, 0, 14}, {2981, 0.5714f, 342, 343, 220, 2, 55, -1, 0, 19}, {2982, 0.5714f, 344, 345, 800, 2, 43, -1, 0, 7}, {2983, 0.5714f, 346, 347, 120, 8, 143, -1, 5, 0}, {2983, 0.5714f, 346, 347, 500, 8, 144, -1, 10, 0}, {2983, 0.5714f, 346, 347, 900, 8, 145, -1, 18, 0}, {2983, 0.5714f, 346, 348, 1400, 8, 146, -1, 25, 0}}+#define SHOP_ITEMS {{3032, 0.5714f, 296, 297, 150, 1, 125, -1, 0, 0}, {3032, 0.5714f, 296, 298, 500, 1, 126, 125, 0, 0}, {3033, 0.5714f, 299, 300, 550, 3, 127, -1, 0, 0}, {3034, 0.5714f, 301, 302, 950, 10, 128, -1, 0, 0}, {3035, 0.5714f, 303, 304, 300, 2, 37, -1, 0, 1}, {3036, 0.5714f, 305, 306, 200, 2, 40, -1, 0, 4}, {3037, 0.5714f, 307, 308, 1800, 0, 119, -1, 0, 0}, {3038, 0.5714f, 309, 310, 60, 11, 129, -1, 0, 0}, {3039, 0.5714f, 311, 312, 220, 2, 38, -1, 0, 2}, {3040, 0.5714f, 313, 314, 120, 0, 2, -1, 0, 0}, {3041, 0.5714f, 315, 316, 40, 9, 130, 10, 0, 0}, {3041, 0.5714f, 317, 318, 80, 9, 131, 28, 0, 0}, {3042, 0.5714f, 319, 320, 100, 16, 133, -1, 0, 0}, {3043, 0.5714f, 321, 322, 100, 16, 134, -1, 0, 0}, {3044, 0.5714f, 323, 324, 100, 16, 135, -1, 0, 0}, {3045, 0.5714f, 325, 326, 100, 16, 137, 147, 0, 0}, {3046, 0.5714f, 327, 328, 100, 16, 136, -1, 0, 0}, {3047, 0.5714f, 329, 330, 100, 17, 139, -1, 0, 0}, {3048, 0.5714f, 331, 332, 100, 17, 140, -1, 0, 0}, {3049, 0.5714f, 333, 334, 100, 17, 141, 14, 0, 0}, {3050, 0.5714f, 335, 336, 210, 17, 142, 14, 0, 0}, {3051, 0.5714f, 337, 338, 250, 2, 44, -1, 0, 8}, {3052, 0.5714f, 339, 340, 300, 2, 54, -1, 0, 18}, {3053, 0.5714f, 341, 342, 120, 2, 50, -1, 0, 14}, {3054, 0.5714f, 343, 344, 220, 2, 55, -1, 0, 19}, {3055, 0.5714f, 345, 346, 800, 2, 43, -1, 0, 7}, {3056, 0.5714f, 347, 348, 120, 8, 143, -1, 5, 0}, {3056, 0.5714f, 347, 348, 500, 8, 144, -1, 10, 0}, {3056, 0.5714f, 347, 348, 900, 8, 145, -1, 18, 0}, {3056, 0.5714f, 347, 349, 1400, 8, 146, -1, 25, 0}}#define SHOP_FIRST {0, 8, 21, 30}-#define SHOP_ROW_GEO {2958, 1.4551f, 0.0000f, 1.0000f, 1.0000f}+#define SHOP_ROW_GEO {3031, 1.4551f, 0.0000f, 1.0000f, 1.0000f}#define SHOP_ROW_COST {1.8423f, 0.2885f}#define SHOP_ACTIVE_RGB {255, 255, 255}#define SHOP_INACTIVE_RGB {141, 141, 141}#define SHOP_ROOMS {"Room_shop", "Room_mapper", "Room_Charm_Shop"}-#define SHOP_NOSTOCK {350, 351, 352}+#define SHOP_NOSTOCK {351, 352, 353}#define SHOP_TITLES {TITLE_SLY, TITLE_ISELDA, TITLE_CHARM_SLUG}#define SHOP_N 3#define COLLECT_FLEUR {0.0000f, 0.0000f, 0.0000f, 1.0000f}@@ -1167,36 +1173,36 @@#define COLLECT_MOVER_TO {-7.7000f, 6.0400f}#define STAG_AT {0.3000f, 0.3000f}#define STAG_K 1.2646f-#define STAG_BACKING {2984, -0.4427f, 0.0000f, 1.0000f, 0.6408f}+#define STAG_BACKING {3057, -0.4427f, 0.0000f, 1.0000f, 0.6408f}#define STAG_BACKING_A 0.9020f-#define STAG_PIECES {{2985, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2986, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2987, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {2988, 0.4147f, 1.5909f, 1.0000f, 1.0000f}}+#define STAG_PIECES {{3058, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {3059, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {3060, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3061, 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 {2989, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define STAG_MAP_SHADOW {2990, 0.0110f, -0.0100f, 1.0000f, 0.9227f}+#define STAG_MAP_KNIGHT {3062, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define STAG_MAP_SHADOW {3063, 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 {2991, 2.8680f, 0.6180f, -1.0000f, 1.0000f}-#define STAG_POINTER_L {2991, -2.8680f, 0.6180f, 1.0000f, 1.0000f}+#define STAG_POINTER_R {3064, 2.8680f, 0.6180f, -1.0000f, 1.0000f}+#define STAG_POINTER_L {3064, -2.8680f, 0.6180f, 1.0000f, 1.0000f}#define STAG_ROW {-7.5992f, 3.9576f}-#define STAG_LIST_KNIGHT {2989, -10.5102f, 4.6056f, 1.0000f, 1.0000f}-#define STAG_DIVIDER {2992, -7.6003f, 5.2734f, -1.0000f, -0.8696f}+#define STAG_LIST_KNIGHT {3062, -10.5102f, 4.6056f, 1.0000f, 1.0000f}+#define STAG_DIVIDER {3065, -7.6003f, 5.2734f, -1.0000f, -0.8696f}#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}-#define TXT_STAG_STATIONS 353-#define TXT_STAG_NAMES {354, 314, 316}-#define STAG_NAMES_STR {118, 117, 121}+#define TXT_STAG_STATIONS 354+#define TXT_STAG_NAMES {355, 315, 317}+#define STAG_NAMES_STR {124, 123, 127}#define STAG_BORDER_TOP {-0.0963f, 7.0185f, 0.9784f, 1.0028f, CLIP_STAGUI_STAG_BORDER_TOP_UP, CLIP_STAGUI_STAG_BORDER_TOP_DOWN, 0}#define STAG_BORDER_BOTTOM {-0.0638f, -6.5632f, 0.9165f, 0.9394f, CLIP_STAGUI_STAG_BORDER_BOTTOM_UP, CLIP_STAGUI_STAG_BORDER_BOTTOM_DOWN, 0}#define STAG_T_ACT_CONFIRM {11.1713f, -4.5306f, 15.3500f}#define STAG_KEY_CONFIRM {11.7464f, -4.7993f}-#define TXT_STAG_CTRL_TRAVEL 355+#define TXT_STAG_CTRL_TRAVEL 356#define STAG_T_ACT_CANCEL {11.1713f, -5.3525f, 15.3500f}#define STAG_KEY_CANCEL {11.7464f, -5.6213f}-#define TXT_STAG_CTRL_CANCEL 289-#define STAG_SCENES_STR {131, 130, 132}+#define TXT_STAG_CTRL_CANCEL 290+#define STAG_SCENES_STR {137, 136, 138}#define STAG_SCENES_ROOM {4, 19, 36}#define ROOM_ZONES {2, 4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 22, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6}#define MSG_FIREBALL 0#define MSG_DASH 1-#define SEMI_PERSIST {250, 251, 252, 258, 259, 260}+#define SEMI_PERSIST {257, 258, 259, 270, 271, 272}diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.hindex 470a24e5..0744792b 100644--- a/games/hollowknight/src/game.h+++ b/games/hollowknight/src/game.h@@ -105,6 +105,7 @@ typedef struct {int save_stats(int slot, SaveStats *st); /* -> 0 no game, 1 a game, -1 a file that does not check out */bool save_clear(int slot);void save_set_respawn(const char *marker, bool facing_right); /* (Bench Control's Rest Burst) */+void save_set_respawn_kind(const char *marker, bool facing_right, int type); /* (respawnType: 0 face down) *//* ---------------------------------------------------------------- the room's game objects (tools/ents.py) */enum { ENT_CAMLOCK = 1, ENT_GATE, ENT_HAZARD_MARKER, ENT_RESPAWN, ENT_HAZARD_TRIGGER, ENT_MASK, ENT_DAMAGE, ENT_SHAPE,@@ -124,7 +125,7 @@ enum { BG_CLOSE, BG_QUICK_CLOSE, BG_OPEN, BG_QUICK_OPEN, BG_DESTROY };void gates_event(int ev);int gate_find(uint16_t name); /* (a gate by its name: the scripts' strings) */void gate_event_at(int k, int ev);-int camlock_find(uint16_t name); /* (a camera lock area by its name: the scripts' strings) */+int camlock_find(uint16_t name); /* (a camera lock area, a mask, by its name: the scripts' strings) */void arena_start(void); /* START (sent by an enemy) */void arena_enemy_died(void); /* (one it counts) */void arena_set_activated(void); /* Activated: its fight over (and saved) */@@ -482,6 +483,9 @@ void hud_draw(void);/* ---------------------------------------------------------------- the camera (camera.c) */void cam_init(void);void cam_tick(void);+#ifdef HOST+void cam_debug(void);+#endifvoid cam_snap_to_hero(void); /* (after a respawn) */enum { SHAKE_ENEMY_KILL = 1, SHAKE_AVERAGE, SHAKE_BIG, SHAKE_SMALL }; /* the CameraShake FSM's events */void cam_shake(int kind);diff --git a/games/hollowknight/src/obj.c b/games/hollowknight/src/obj.cindex 24844fed..2e4b643b 100644--- a/games/hollowknight/src/obj.c+++ b/games/hollowknight/src/obj.c@@ -9,7 +9,7 @@#endif#define DT 0.02f-#define MAX_OBJS 96+#define MAX_OBJS 80 /* (the most a room has: 69, Crossroads_ShamanTemple) */#define MAX_PIECES 24typedef struct {@@ -461,7 +461,7 @@ int camlock_find(uint16_t name) {int n;const Ent *es = room_ents(&n);for (int i = 0; i < n && i < MAX_ENTS; i++)- if (es[i].type == ENT_CAMLOCK && es[i].s1 == name) return i;+ if ((es[i].type == ENT_CAMLOCK || es[i].type == ENT_MASK) && es[i].s1 == name) return i;return -1;}@@ -828,6 +828,9 @@ void obj_enter(void) {if (es[i].flags == OK_ENEMY || es[i].flags == OK_BENCH || es[i].flags == OK_ARENA || es[i].flags == OK_EVENT ||es[i].flags == OK_SUMMON)continue; /* (enemy.c's, npc.c's; below) */+#ifdef HOST+ if (nobjs == MAX_OBJS - 1) fprintf(stderr, "obj: room %d has more objects than %d\n", g_room.id, MAX_OBJS);+#endifObj *o = &objs[nobjs++];memset(o, 0, sizeof *o);o->kind = es[i].flags, o->ent = (uint16_t)i;diff --git a/games/hollowknight/src/save.c b/games/hollowknight/src/save.cindex 8d07c59b..37e17daa 100644--- a/games/hollowknight/src/save.c+++ b/games/hollowknight/src/save.c@@ -128,11 +128,13 @@ bool save_load(int slot) {return true;}-void save_set_respawn(const char *marker, bool facing_right) {- /* (SetPlayerDataString respawnMarkerName, respawnScene; respawnType 1: a bench) */+void save_set_respawn_kind(const char *marker, bool facing_right, int type) {+ /* (SetPlayerDataString respawnMarkerName, respawnScene; respawnType 1: a bench, 0: face down) */strncpy(g_pd.respawn_marker, marker, SCENE_NAME - 1);strncpy(g_pd.respawn_scene, room_name(g_room.id), SCENE_NAME - 1);g_pd.respawn_marker[SCENE_NAME - 1] = g_pd.respawn_scene[SCENE_NAME - 1] = 0;- g_pd.respawn_type = 1;+ g_pd.respawn_type = (uint8_t)type;g_pd.respawn_facing_right = facing_right;}++void save_set_respawn(const char *marker, bool facing_right) { save_set_respawn_kind(marker, facing_right, 1); }diff --git a/games/hollowknight/src/vm.c b/games/hollowknight/src/vm.cindex 2402f283..ff60d0e3 100644--- a/games/hollowknight/src/vm.c+++ b/games/hollowknight/src/vm.c@@ -11,8 +11,9 @@#endif#define DT 0.02f-#define MAX_VM_OBJS 32 /* (tools/vm.py: MAX_OBJS, MAX_FSMS, MAX_VARS) */-#define MAX_VM_FSMS 24+#define MAX_VM_OBJS 48+#define MAX_VM_ANIMS 20 /* (its objects that animate: an animator, a wave, a fade) */ /* (tools/vm.py: MAX_OBJS, MAX_FSMS, MAX_VARS) */+#define MAX_VM_FSMS 26#define MAX_VM_VARS 256#define MAX_MOVERS 4#define NONE 0xFFFF@@ -47,10 +48,10 @@ typedef struct {typedef struct {float x, y, sx, sy; /* its place and scale now */- Anim anim;uint16_t flags;uint8_t alpha; /* (its material's color's alpha: the scripts') */int8_t fade; /* (iTweenFadeTo: its alpha's change a step, to none or all) */+ int8_t anim; /* (its animation: one of vm.anims; -1 none) */} Obj;typedef struct {int16_t obj; /* (-1: none) */@@ -86,11 +87,14 @@ static struct {const uint8_t *map; /* (clip maps: string, clip) */int nobjs, nfsms;Obj objs[MAX_VM_OBJS];+ Anim anims[MAX_VM_ANIMS];Fsm fsms[MAX_VM_FSMS];uint32_t vars[MAX_VM_VARS];Mover movers[MAX_MOVERS];const uint8_t *persist; /* (what the save keeps: FSM, slot, bit) */int npersist;+ const uint8_t *folds; /* (sprites drawn with their objects: 36 bytes each) */+ int nfolds;Fsm *executing; /* (the FSM whose action runs: its events to itself wait) */int depth;/* the area title's variables as scripts set them (title.c starts it from them) */@@ -99,7 +103,8 @@ static struct {bool blank_on;int title;uint32_t prev_keys;- uint32_t touch, touch_was; /* (objects whose colliders the Knight touches, this step and the one before) */+ uint8_t nanims;+ uint64_t touch, touch_was; /* (objects whose colliders the Knight touches, this step and the one before) */float nail_dir, spell_dir, dmg_dir; /* (the nail's last blow, the spell's way; the hit's: damages_enemy's direction) */uint8_t dmg_type; /* (its attackType: 0 the nail, 2 a spell) */} vm;@@ -157,9 +162,11 @@ static float fval(const Fsm *f, uint16_t s) {return x;}static int ival(const Fsm *f, uint16_t s) { return (int32_t)val(f, s); }+static int named(uint16_t name);static int oval(const Fsm *f, uint16_t s) {uint32_t o = val(f, s);if (s == NONE) return NONE;+ if (o >> 16 == 1) return named((uint16_t)o); /* (one of the game's, by its name: a mask) */return o == OWNER ? f->owner : (int)(o & 0xFFFF);}static void set_var(Fsm *f, uint8_t v, uint32_t x) {@@ -328,9 +335,19 @@ static int obj_clip(int o, uint16_t name) {return -1;}+/* an object by its name: the scripts', on; or a battle gate, a camera lock area, a mask (the game's) */+static int named(uint16_t name) {+ for (int i = 0; i < vm.nobjs; i++)+ if (vm.rec[i].name == name && obj_active(i)) return i;+ int g = gate_find(name), c = g < 0 ? camlock_find(name) : -1;+ return g >= 0 ? O_GATE + g : c >= 0 ? O_ENT + c : NONE;+}++static Anim *oanim(int o) { return vm.objs[o].anim >= 0 ? &vm.anims[vm.objs[o].anim] : NULL; }+static Anim *obj_anim(int o) {if (o == O_HERO) return &g_hero.anim;- return obj_ok(o) ? &vm.objs[o].anim : NULL;+ return obj_ok(o) ? oanim(o) : NULL;}static Mover *mover(int o, bool make) {@@ -349,9 +366,9 @@ static Mover *mover(int o, bool make) {/* (an animator plays its first clip the first time its object is on) */static void anims_start(void) {for (int i = 0; i < vm.nobjs; i++)- if (!(vm.objs[i].flags & OF_STARTED) && vm.rec[i].clip != NONE && obj_active(i)) {+ if (!(vm.objs[i].flags & OF_STARTED) && vm.rec[i].clip != NONE && obj_active(i) && oanim(i)) {vm.objs[i].flags |= OF_STARTED;- anim_play_from_frame(&vm.objs[i].anim, vm.rec[i].clip, 0);+ anim_play_from_frame(oanim(i), vm.rec[i].clip, 0);}}@@ -376,7 +393,7 @@ static void obj_set_active(int o, bool on) {else vm.objs[o].flags &= (uint16_t)~OF_ACTIVE;if (!was && on) anims_start();/* (its wave, its fade, from the start; a wave's speed (anim.fps) its first) */- if (!was && on && (vm.rec[o].flags & (OF_WAVE | OF_FADE))) vm.objs[o].anim.time = 0, vm.objs[o].anim.fps = vm.rec[o].bx;+ if (!was && on && (vm.rec[o].flags & (OF_WAVE | OF_FADE)) && oanim(o)) oanim(o)->time = 0, oanim(o)->fps = vm.rec[o].bx;/* (an FSM starts again as its object comes on: RestartOnEnable; the first time, on its Start, the next frame) */if (!was && on)for (int i = 0; i < vm.nfsms; i++) {@@ -467,6 +484,11 @@ void vm_fsm_set(int fsm, int var, uint32_t v, int ev) {}static void obj_event(int o, int ev, uint16_t fsm_name) {+ if (o >= O_ENT && o < O_ENT + MAX_ENTS) {+ /* (a mask told to uncover: HIT, UNCOVER) */+ if (ev == VMEV_HIT || ev == VMEV_UNCOVER) world_send_hit(o - O_ENT);+ return;+ }if (o >= O_GATE && o < O_GATE + 0x100) {if (ev >= VMEV_BG_CLOSE && ev <= VMEV_BG_DESTROY) gate_event_at(o - O_GATE, ev - VMEV_BG_CLOSE);return;@@ -753,6 +775,13 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {}return true;}+ case VMOP_SETBENCHRESPAWN: {+ uint16_t m = rv(&r);+ int type = rb(&r);+ bool right = rb(&r);+ save_set_respawn_kind(str_at(m), right, type);+ return true;+ }case VMOP_FREEZEMOMENT: {/* (GameManager.FreezeMoment: its kinds) */int k = rb(&r);@@ -847,6 +876,21 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {set_var(f, v, (uint32_t)(ival(f, v) + ival(f, rv(&r))));return !rb(&r);}+ case VMOP_FLOATSWITCH: {+ /* (the first of its bounds the value is under: that one's event) */+ float x = fval(f, rv(&r));+ int n = rb(&r);+ const uint8_t *lt = r.p;+ r.p += 2 * n;+ int ne = rb(&r);+ for (int i = 0; i < n && i < ne; i++)+ if (x < fval(f, rd16(lt + 2 * i))) {+ fsm_event(f, r.p[i]);+ break;+ }+ r.p += ne;+ return !rb(&r);+ }case VMOP_INTSWITCH: {int x = ival(f, rv(&r));int n = rb(&r);@@ -1327,11 +1371,14 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {case 19: set_var(f, store, hero_can_talk()); break; /* (CanInspect: as CanTalk) */case 20: set_var(f, store, h->accepting_input); break; /* (CanInput) */case 22: hero_cancel_hero_jump(); break;+ case 23: if (!h->cs.on_ground) h->cs.will_hard_land = true; break; /* (ForceHardLanding) */+ case 24: hero_add_health((int)a0); break; /* (AddHealth) */+ case 25: hero_add_mp_charge((int)a0); break; /* (TryAddMPChargeSpa) */case 21: {/* (GetState: tools/vm.py's HERO_STATES) */int k = (int)a0;set_var(f, store, k == 0 ? h->cs.on_ground : k == 1 ? h->cs.attacking : k == 2 ? h->cs.up_attacking- : k == 3 ? h->cs.down_attacking : k == 4 ? h->cs.dashing : 0);+ : k == 3 ? h->cs.down_attacking : k == 4 ? h->cs.dashing : k == 6 ? h->cs.will_hard_land : 0);break;}}@@ -1387,16 +1434,7 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {return true;case VMOP_FINDGAMEOBJECT: {uint16_t name = (uint16_t)val(f, rv(&r));- int found = NONE;- for (int i = 0; i < vm.nobjs && found == NONE; i++)- if (vm.rec[i].name == name && obj_active(i)) found = i;- if (found == NONE) {- /* (a battle gate, a camera lock area: the game's) */- int g = gate_find(name), c = g < 0 ? camlock_find(name) : -1;- if (g >= 0) found = O_GATE + g;- else if (c >= 0) found = O_ENT + c;- }- set_var(f, rb(&r), (uint32_t)found);+ set_var(f, rb(&r), (uint32_t)named(name));return true;}case VMOP_CREATEOBJECT: {@@ -1645,8 +1683,13 @@ void vm_enter(void) {if ((r->cond != NONE && pd_flag(r->cond & 0x7FFF) == ((r->cond & 0x8000) != 0)) ||(r->cond2 != NONE && pd_flag(r->cond2 & 0x7FFF) == ((r->cond2 & 0x8000) != 0)))o->flags = OF_COND_OFF;- o->anim.clip = -1, o->anim.sprite = -1;- if (r->flags & OF_WAVE) o->anim.fps = r->bx;+ /* (an animation for those that need one) */+ o->anim = -1;+ if ((r->flags & (OF_ANIMATOR | OF_WAVE | OF_FADE)) && vm.nanims < MAX_VM_ANIMS) {+ Anim *a = &vm.anims[o->anim = (int8_t)vm.nanims++];+ a->clip = -1, a->sprite = -1;+ if (r->flags & OF_WAVE) a->fps = r->bx;+ }o->alpha = 255;}const uint8_t *p = vm.map + 4 * nmap;@@ -1674,6 +1717,7 @@ void vm_enter(void) {} else if (persist_get(id))set_var(&vm.fsms[p[0]], p[1], 1);}+ vm.nfolds = rd16(p), vm.folds = p + 2;vm.prev_keys = g_hero.keys;/* (what it holds within the condition's: off too) */for (int i = 0; i < nobjs; i++)@@ -1695,8 +1739,8 @@ void vm_tick(void) {Obj *o = &vm.objs[i];o->flags = (uint16_t)((o->flags & ~(OF_WAS_INSIDE | OF_SPELL_WAS | OF_NAIL_WAS)) | ((o->flags & OF_INSIDE) ? OF_WAS_INSIDE : 0) |((o->flags & OF_SPELL_IN) ? OF_SPELL_WAS : 0) | ((o->flags & OF_NAIL_IN) ? OF_NAIL_WAS : 0));- vm.touch_was = (vm.touch_was & ~(1u << i)) | (vm.touch & (1u << i));- vm.touch = (vm.touch & ~(1u << i)) | (vm.rec[i].ncol && obj_active(i) && hero_touches(i) ? 1u << i : 0);+ vm.touch_was = (vm.touch_was & ~(1ull << i)) | (vm.touch & (1ull << i));+ vm.touch = (vm.touch & ~(1ull << i)) | (vm.rec[i].ncol && obj_active(i) && hero_touches(i) ? 1ull << i : 0);bool on = (vm.rec[i].flags & OF_TRIGGER) && (o->flags & OF_COLLIDER) && obj_active(i);bool in = on && hero_box_in(i), spell = on && (o->flags & OF_SPELL_HIT), nail = on && (o->flags & OF_NAIL_HIT);o->flags = (uint16_t)((in ? o->flags | OF_INSIDE : o->flags & ~OF_INSIDE) & ~(OF_SPELL_HIT | OF_NAIL_HIT));@@ -1714,23 +1758,25 @@ void vm_tick(void) {if (a <= 0 || a >= 255) a = a <= 0 ? 0 : 255, o->fade = 0;o->alpha = (uint8_t)a;}+ Anim *an = oanim(i);+ if (!an) continue;if (vm.rec[i].flags & OF_WAVE) {/* (WaveEffectControl: its speed down by a twentieth a step, to a half at least; its timer at that speed; past 1,* off) */if (obj_active(i)) {- o->anim.fps = o->anim.fps * 0.95f < 0.5f ? 0.5f : o->anim.fps * 0.95f;- if ((o->anim.time += DT * o->anim.fps) > 1) obj_set_active(i, false);+ an->fps = an->fps * 0.95f < 0.5f ? 0.5f : an->fps * 0.95f;+ if ((an->time += DT * an->fps) > 1) obj_set_active(i, false);}continue;}if (vm.rec[i].flags & OF_FADE) {/* (SimpleSpriteFade: over its time; then off) */- if (obj_active(i) && (o->anim.time += DT / vm.rec[i].bx) >= 1) obj_set_active(i, false);+ if (obj_active(i) && (an->time += DT / vm.rec[i].bx) >= 1) obj_set_active(i, false);continue;}- o->anim.events = 0;- anim_update(&o->anim, DT);- if ((vm.rec[i].flags & OF_ANIM_OFF) && (o->anim.events & ANIM_DONE)) obj_set_active(i, false);+ an->events = 0;+ anim_update(an, DT);+ if ((vm.rec[i].flags & OF_ANIM_OFF) && (an->events & ANIM_DONE)) obj_set_active(i, false);}/* (those set moving: falling to the ground) */for (int k = 0; k < MAX_MOVERS; k++) {@@ -1832,11 +1878,12 @@ void vm_draw(void) {const Obj *o = &vm.objs[i];const ObjRec *r = &vm.rec[i];if (!(o->flags & OF_RENDERER) || !obj_active(i)) continue;- int sprite = (r->flags & OF_ANIMATOR) ? o->anim.sprite : (r->sprite == NONE ? -1 : r->sprite);+ const Anim *an = oanim(i);+ int sprite = (r->flags & OF_ANIMATOR) ? (an ? an->sprite : -1) : (r->sprite == NONE ? -1 : r->sprite);if (sprite < 0) continue;Inst in;/* (its color: its renderer's, its alpha the scripts' too; a wave's, a fade's as they go) */- float a = r->a / 255.0f * o->alpha / 255.0f, t = o->anim.time, sx = o->sx, sy = o->sy;+ float a = r->a / 255.0f * o->alpha / 255.0f, t = an ? an->time : 0, sx = o->sx, sy = o->sy;if (r->flags & OF_WAVE) a *= 1 - t, sx = sy = (1 + 4 * t) * r->by;else if (r->flags & OF_FADE) a = a + (r->by - a) * (t > 1 ? 1 : t);uint8_t al = (uint8_t)(a <= 0 ? 0 : a >= 1 ? 255 : a * 255 + 0.5f), tint = 0;@@ -1846,6 +1893,20 @@ void vm_draw(void) {in.flags = (uint8_t)((in.flags & ~F_BLEND) | (r->blend & 0xFF));gfx_actor(&in, SORT_KEY(r->layer, r->order));}+ /* (sprites drawn with their objects: on with them, at their alpha, where they are) */+ for (int k = 0; k < vm.nfolds; k++) {+ const uint8_t *q = vm.folds + 36 * k;+ int i = q[0];+ if (i >= vm.nobjs || !obj_active(i)) continue;+ const Obj *o = &vm.objs[i];+ uint8_t al = (uint8_t)(q[31] * o->alpha / 255), tint = 0;+ if (!al) continue;+ if (al != 255 || (q[28] & q[29] & q[30]) != 255) tint = obj_tint(&ntint, q[28], q[29], q[30], al);+ Inst in;+ sprite_inst((int16_t)rd16(q + 2), o->x + rdf(q + 4), o->y + rdf(q + 8), rdf(q + 12), rdf(q + 16), rdf(q + 20), tint, &in);+ in.flags = (uint8_t)((in.flags & ~F_BLEND) | q[32]);+ gfx_actor(&in, SORT_KEY(rd16(q + 24), (int16_t)rd16(q + 26)));+ }}#ifdef HOST@@ -1861,7 +1922,8 @@ void vm_debug(void) {for (int i = 0; i < vm.nobjs; i++)printf(" obj %d name %d flags %d active %d cols %d+%d at %.2f,%.2f clip %d sprite %d/%d alpha %d scale %.2f,%.2f\n", i,vm.rec[i].name, vm.objs[i].flags, obj_active(i), vm.rec[i].col0, vm.rec[i].ncol, vm.objs[i].x, vm.objs[i].y,- vm.objs[i].anim.clip, vm.objs[i].anim.sprite, vm.rec[i].sprite, vm.objs[i].alpha, vm.objs[i].sx, vm.objs[i].sy);+ oanim(i) ? oanim(i)->clip : -1, oanim(i) ? oanim(i)->sprite : -1, vm.rec[i].sprite, vm.objs[i].alpha,+ vm.objs[i].sx, vm.objs[i].sy);if (getenv("VMOBJ"))for (int i = 0; i < vm.nobjs; i++)if (vm.rec[i].flags & OF_TRIGGER)diff --git a/games/hollowknight/tests/play.c b/games/hollowknight/tests/play.cindex f10d9bb7..7d4529e3 100644--- a/games/hollowknight/tests/play.c+++ b/games/hollowknight/tests/play.c@@ -179,6 +179,7 @@ int main(int argc, char **argv) {}printf("end: pos %.3f,%.3f state %d\n", g_hero.body.x, g_hero.body.y, g_hero.state);if (getenv("HKROOM")) printf("room: %s\n", room_name(g_room.id));+ if (getenv("HKCAM")) cam_debug();if (getenv("HKPD")) {/* (the PlayerData bools on, by number; Hornet's Greenpath count) */printf("pd:");diff --git a/games/hollowknight/tools/ents.py b/games/hollowknight/tools/ents.pyindex cb49eec1..5fd8ab8c 100644--- a/games/hollowknight/tools/ents.py+++ b/games/hollowknight/tools/ents.py@@ -856,8 +856,9 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0g = new_group(o["id"])g2 = new_group(inverse) if inverse else 0persistent = any(c.get("class") == "PersistentBoolItem" for c in o["c"])+ import vmrecs.append(rec(ENT_MASK, kind, box, (fade, pause, p2, p3), group=g, group2=g2,- persist=persist.id(name, o["path"]) if persistent else NO_PERSIST))+ persist=persist.id(name, o["path"]) if persistent else NO_PERSIST, s1=vm.STR.id(o["name"])))recs += _more_boxes(o)classes = {c.get("class") for c in o["c"]}f = _fsm(o, ("Bench Control",))diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.pyindex dfd2b294..7ec8e58c 100644--- a/games/hollowknight/tools/vm.py+++ b/games/hollowknight/tools/vm.py@@ -10,7 +10,8 @@ import unity, text, state# rooms -> the objects whose scripts run here (and all under them)ROOMS = {- "Town": ["_NPCs/Elderbug", "_NPCs/Tiso Town NPC"],+ "Town": ["_NPCs/Elderbug", "_NPCs/Tiso Town NPC", "_Areas/Death Respawn Trigger", "_Areas/Death Respawn Trigger 1",+ "_Props/Mappers_house/closed/Inspect Region", "Interact Reminder"],"Room_temple": ["Quirrel"],"Crossroads_47": ["_NPCs/Tiso Bench NPC", "Stag", "_Scenery/Station Bell", "Stag_Tunnel/Stag_tunnel_Grate","Stag Blanker"],@@ -22,16 +23,19 @@ ROOMS = {"Fungus1_04": ["Hornet Infected Knight Encounter", "Hornet Saver", "Cloak Corpse", "Dream Scene Activate","Dreamer Scene 1"],"Crossroads_ShamanTemple": ["_Props/Shaman Meeting", "_Props/Shaman Trapped", "_Props/Shaman Killed Blocker",- "_Props/Knight Get Fireball", "Battle Scene/Reminder Cast", "Shiny Item", "Soul Totem 2"],+ "_Props/Knight Get Fireball", "Battle Scene/Reminder Cast", "Shiny Item", "Soul Totem 2",+ "Bone Gate", "Reminder Cast (1)",+ "_Areas/Death Respawn Trigger 1"],# items lying about (Shiny Item: a relic, a charm), the City Crest the False Knight leaves- "Crossroads_01": ["Shiny Item"],- "Tutorial_01": ["_Props/Chest/Item"], # (its chest: src/obj.c, which turns on what is in it)+ "Crossroads_01": ["Shiny Item", "Force Hard Landing"],+ "Tutorial_01": ["_Props/Chest/Item", "_Props/Collapser Tute 01", "_Scenery/Break Floor 1", "Interact Reminder",+ "_Props/Tute Door 5/Active/Jump Reminder"], # (its chest: src/obj.c, which turns on what is in it)"Fungus1_22": ["Shiny Item", "Gate Switch", "Metal Gate", "Breakable Wall"],- "Crossroads_10": ["Key Giver"],+ "Crossroads_10": ["Key Giver", "Breakable Wall"],# the shops: their keepers, their regions (the menu: src/shop.c)"Room_shop": ["Basement Closed"],"Room_mapper": ["Iselda", "Shop Region"],- "Room_Charm_Shop": ["Charm Slug", "Shop Region"],+ "Room_Charm_Shop": ["Charm Slug", "Shop Region", "Scene Blanker"],# the grubs in their jars; the Grubfather, his rewards, the grubs back home"Crossroads_03": ["_Props/Grub Bottle", "_Props/Toll Gate", "_Props/Toll Gate 1", "_Props/Toll Gate Switch","Break Wall 2"],@@ -45,9 +49,11 @@ ROOMS = {"Toll Gate", "Toll Gate (1)"],# the world's other scripted things: walls that break, floors, a soul totem, tablets, a wall that turns on"Crossroads_08": ["Break Wall 2"],- "Crossroads_04": ["_Scenery/Break Floor 1"],+ "Crossroads_04": ["_Scenery/Break Floor 1", "CamLock Destroyer"],"Crossroads_19": ["Soul Totem mini_two_horned"],- "Crossroads_21": ["Breakable Wall", "Polygon_Collider_Cross_21 1/Roof Collider (1)"],+ "Crossroads_21": ["Breakable Wall", "Polygon_Collider_Cross_21 1/Roof Collider (1)", "Collapser Small"],+ "Crossroads_07": ["Breakable Wall_Silhouette"],+ "Crossroads_30": ["Spa Region"],"Crossroads_33": ["_Props/full_wall_left"],"Fungus1_32": ["Breakable Wall", "Inspect Region"],"Crossroads_11_alt": ["Inspect Region"],@@ -87,6 +93,25 @@ def _fsm(name, start, vars_, states):def _behaviours(rm, o):"""The game's own components that are scripts here (as the FSMs they would be)."""out = []+ rt = next((c.get("v") for c in o["c"] if c.get("class") == "RespawnTrigger" and c.get("v")), None)+ if rt is not None and isinstance(rt.get("respawnMarker"), list):+ # RespawnTrigger: the Knight coming into it makes its marker where he comes back from death (single use: once,+ # Activated kept by its PersistentBoolItem)+ import pack+ pid = rt["respawnMarker"][1]+ mk = next(q for q in rm.d["objects"] for c in q["c"] if c.get("pid") == pid)+ right = next(c.get("v") or {} for c in mk["c"] if c.get("pid") == pid).get("respawnFacingRight", 0)+ single = bool(rt.get("singleUse"))+ out.append({"fsm": _fsm("Respawn Trigger", "Init", {"Activated": ["bool", False]}, [+ ("Init", [("BoolTest", {"boolVariable": "$Activated", "isTrue": ["event", "DONE"], "isFalse": None,+ "everyFrame": False})], {"FINISHED": "Idle", "DONE": "Done"}),+ ("Idle", [("Trigger2dEvent", {"trigger": 0, "collideTag": "Player", "collideLayer": "",+ "sendEvent": ["event", "ENTER"], "storeCollider": None})], {"ENTER": "Set"}),+ ("Set", [("SetBenchRespawn", {"marker": pack.STRINGS.id(mk["name"]), "type": rt.get("respawnType", 0),+ "facing": 1 if right else 0}),+ ("SetBoolValue", {"boolVariable": "$Activated", "boolValue": single, "everyFrame": False})],+ {"FINISHED": "Done" if single else "Idle"}),+ ("Done", [], {})])})g = next((c.get("v") for c in o["c"] if c.get("class") == "GrubBGControl" and c.get("v")), None)if g is not None:# GrubBGControl: a grub back home, there once that many are saved@@ -112,13 +137,14 @@ def _behaviours(rm, o):# FSMs left out (what this port does not have: the dream nail, sounds...)-SKIP_FSMS = {"npc_dream_dialogue", "Dream Dialogue", "Rotate", "Shop Open Voice", "Enviro Region", "tink_effect"}+SKIP_FSMS = {"npc_dream_dialogue", "Dream Dialogue", "Rotate", "Shop Open Voice", "Enviro Region", "tink_effect",+ "RespawnTriggerFSM"}# objects left out (effects drawn by the C code, or nothing at all; the dream nail's; Dreamer Scene 1's Knight Lift,# which nothing turns on)SKIP_CLASSES = {"SpellGetOrb", "ParticleSystem"}SKIP_NAMES = {"Dream Dialogue", "Dream Dialogue Flower", "Flower", "Flower Give", "white_light", "white_light 1","Knight Lift"}-MAX_OBJS, MAX_FSMS, MAX_VARS = 32, 24, 256 # (src/vm.c)+MAX_OBJS, MAX_FSMS, MAX_VARS, MAX_ANIMS = 48, 26, 256, 20 # (src/vm.c)# the grubs in this part of the game (Crossroads_03, Fungus1_21): the Grubfather's rewards past them never comeGRUBS = 2# the ints ConvertIntToString turns into strings here (the Grubfather's rewards given)@@ -186,7 +212,7 @@ for e in ("FINISHED", "CONVO_FINISH", "CONVO START", "CONVO END", "BIG TITLE STA"HORNET LEAVE", "BG CLOSE", "BG QUICK CLOSE", "BG OPEN", "BG QUICK OPEN", "BG DESTROY", "WAKE", "BOX UP DREAM","BOX DOWN DREAM", "FADE IN", "FADE OUT", "FSM CANCEL", "CLOSE", "FK DEATH", "SHOP UP", "SHOP CLOSED","SHOP CLOSED QUICK", "SHOP WINDOW UP", "RESET SHOP WINDOW", "CLOSE SHOP WINDOW", "BOX UP YN", "BOX DOWN YN",- "YES", "NO", "CONTINUE", "RESET"):+ "YES", "NO", "CONTINUE", "RESET", "HIT", "UNCOVER"):EVENTS.id(e)FIXED_EVENTS = len(EVENTS.list) # (src/data.h: VMEV_*)@@ -232,6 +258,7 @@ op("IntCompareToBool", ("integer1", "i"), ("integer2", "i"), ("equalBool", "B"),("greaterThanBool", "B"), ("everyFrame", "n"))op("IntAdd", ("intVariable", "I"), ("add", "i"), ("everyFrame", "n"))op("IntSwitch", ("intVariable", "i"), ("compareTo", "i*"), ("sendEvent", "e*"), ("everyFrame", "n"))+op("FloatSwitch", ("floatVariable", "f"), ("lessThan", "f*"), ("sendEvent", "e*"), ("everyFrame", "n"))op("BoolTest", ("boolVariable", "b"), ("isTrue", "e"), ("isFalse", "e"), ("everyFrame", "n"))op("BoolAllTrue", ("boolVariables", "b*"), ("sendEvent", "e"), ("storeResult", "B"), ("everyFrame", "n"))op("BoolAnyTrue", ("boolVariables", "b*"), ("sendEvent", "e"), ("storeResult", "B"), ("everyFrame", "n"))@@ -353,15 +380,17 @@ op("GetDistance", ("gameObject", "o"), ("target", "o"), ("storeResult", "F"), ("op("SoulOrbs", ("spawnMin", "i"), ("spawnMax", "i"), ("speedMin", "f"), ("speedMax", "f"), ("angleMin", "f"),("angleMax", "f"), ("originVariationX", "f"), ("originVariationY", "f")) # (Soul Orb R: flung, then to the Knight)op("FadeTo", ("gameObject", "o"), ("alpha", "f"), ("time", "f"), ("includeChildren", "n")) # (iTweenFadeTo)+op("SetBenchRespawn", ("marker", "x"), ("type", "n"), ("facing", "n")) # (PlayerData.SetBenchRespawn: the marker's name)# HeroController's methods the scripts call (HeroCall's method)HERO_METHODS = ["RelinquishControl", "RegainControl", "StopAnimationControl", "StartAnimationControl", "FaceLeft","FaceRight", "CanTalk", "PreventCastByDialogueEnd", "SetBackOnGround", "AddMPCharge","FindGroundPoint", "SetBenchRespawn", "SetHazardRespawn", "RelinquishControlNotVelocity","SetCState", "SaveGame", "AffectedByGravity", "ResetHardLandingTimer", "StopPlayingAudio", "CanInspect",- "CanInput", "GetState", "CancelHeroJump"]+ "CanInput", "GetState", "CancelHeroJump", "ForceHardLanding", "AddHealth", "TryAddMPChargeSpa"]# (GetState's states, by name: its argument)-HERO_STATES = ["onGround", "attacking", "upAttacking", "downAttacking", "dashing", "backDashing"]+HERO_STATES = ["onGround", "attacking", "upAttacking", "downAttacking", "dashing", "backDashing", "willHardLand",+ "spellQuake"] # (backDashing, spellQuake: never here)# the geo prefabs (Geo Small, Med, Large): GeoControl's typesGEO_PREFABS = {("resources.assets", 5736): 0, ("resources.assets", 6395): 1, ("resources.assets", 6376): 2}SOUL_ORB = ("resources.assets", 4231) # (Soul Orb R: src/obj.c's soul orbs)@@ -418,6 +447,7 @@ class Room:self.by_id[c["id"]] = cself.by_path.setdefault(q["path"], c)self.objs, self.obj_index = [], {}+ self.folds = [] # (sprites drawn with an object of theirs, nothing else to them: (its object, them))self.fsms = []self.persist, self.persist_objs = [], [] # (PersistentBoolItem: FSM, its Activated's slot, its object)self.problems = []@@ -441,12 +471,55 @@ class Room:return Falsereturn not (cls & SKIP_CLASSES) and o["name"] not in SKIP_NAMES+ def referenced(self):+ """the names and objects the scene's scripts can find (FindChild, FindGameObject, references)"""+ if not hasattr(self, "_refs"):+ names, ids = set(), set()++ def walk(v):+ if isinstance(v, str):+ names.add(v)+ elif isinstance(v, (list, tuple)):+ if len(v) == 3 and v[0] == "ref":+ ids.add(v[2])+ for x in v:+ walk(x)+ elif isinstance(v, dict):+ for x in v.values():+ walk(x)+ for q in list(self.by_id.values()):+ for c in q["c"]:+ f = c.get("fsm")+ if f:+ walk(f["vars"])+ for st in f["states"]:+ for a in st["actions"]:+ walk(a["params"])+ self._refs = names, ids+ return self._refs++ def foldable(self, q):+ """a sprite and nothing else, on, under nothing, that no script finds: drawn with its parent's object"""+ if q.get("children") or not q.get("active") or not q.get("self_active", True):+ return False+ if {c.get("class") or c["type"] for c in q["c"]} != {"SpriteRenderer"}:+ return False+ sr = next(c.get("v") for c in q["c"])+ if not sr or not sr.get("m_Sprite") or not sr.get("m_Enabled", 1):+ return False+ names, ids = self.referenced()+ return q["name"] not in names and q.get("_raw", q["id"]) not in ids and not any(c.get("pid") in ids for c in q["c"])+def add_tree(self, o):if not self.want(o):return- self.obj(o)+ i = self.obj(o)for c in o.get("children", []):- self.add_tree(self.by_id[c])+ q = self.by_id[c]+ if self.foldable(q):+ self.folds.append((i, q))+ else:+ self.add_tree(q)def obj(self, o):if o["id"] in self.obj_index:@@ -489,6 +562,10 @@ class Room:o = self.by_id.get(key(r[2]) if key else r[2])if o is None:return O_NONE+ # (a mask not the scripts' own: the game's, found by its name as the FSM runs)+ if o["id"] not in self.obj_index and any(c.get("fsm") and c["fsm"]["name"] in ("unmasker", "remasker", "remasker_inverse")+ for c in o["c"]):+ return 0x10000 | STR.id(o["name"])if o["id"] not in self.obj_index:self.add_tree(o)return self.obj_index.get(o["id"], O_NONE)@@ -829,7 +906,7 @@ class Compiler:return bytes([len(w)]) + bytes(int(round(255 * x / sum(w))) for x in w)if kind == "x*":return bytes([len(v)]) + b"".join(struct.pack("<H", q) for q in v)- if kind in ("i*", "b*", "e*"):+ if kind in ("i*", "b*", "e*", "f*"):v = v or []out = bytes([len(v)])for q in v:@@ -1107,7 +1184,8 @@ class Compiler:if beh == "HeroPlatformStick" and m in ("Activate", "Deactivate"):return self.emit("PlatformStick", {"on": 1 if m == "Activate" else 0})if beh == "HeroController" and m in HERO_METHODS:- a0 = args[0]["f"] if args and args[0].get("type") in (5, 0) else 0+ a0 = args[0]["f"] if args and args[0].get("type") in (5, 0) else \+ args[0]["i"] if args and args[0].get("type") == 1 else 0if m == "GetState":a0 = HERO_STATES.index(args[0]["s"])return self.emit("HeroCall", {"method": HERO_METHODS.index(m), "store": P.get("storeResult"), "a": a0})@@ -1198,12 +1276,24 @@ class Compiler:return self.emit("Collision2dEvent", P)if n == "WaitForHeroInPosition":return self.emit(n, P)- if n in ("IntOperator", "GetDistance"):+ if n in ("IntOperator", "GetDistance", "SetBenchRespawn"):+ return self.emit(n, P)+ if n in ("SetPlayerDataInt", "GetPlayerDataInt") and P.get("intName") in ("environmentType", "environmentTypeDefault"):+ return None # (footsteps' sounds)+ if n == "FloatSwitch":return self.emit(n, P)if n == "SetPolygonCollider":return self.emit("SetCollider", P)if n == "SetProperty" and not (P.get("targetProperty") or {}).get("target"):return None+ if n == "SetProperty" and (P.get("targetProperty") or {}).get("prop") == "enabled":+ # (a collider of its object's switched off: as SetCollider)+ t = P["targetProperty"]["target"]+ q = next((q for q in self.rm.by_id.values() for c in q["c"] if c.get("pid") == t[2] and+ c["type"] in ("BoxCollider2D", "PolygonCollider2D", "CircleCollider2D")), None)+ if q is not None and q["id"] in self.rm.obj_index:+ return self.emit("SetCollider", {"gameObject": ["ref", 0, q["id"]] if q is not self.o else "Owner",+ "active": False})if n == "iTweenFadeTo":if P.get("delay") or (P.get("loopType") or 0) or P.get("finishEvent") or P.get("speed") is not None:self.problem("iTweenFadeTo %r" % P)@@ -1402,8 +1492,10 @@ def prepare(rooms, sprites, texts):print("vm:", p)assert len(EVENTS.list) < 255, (name, len(EVENTS.list))nvars = sum(len(i) for _, _, i, _ in rm.fsms)- assert len(rm.objs) <= MAX_OBJS and len(rm.fsms) <= MAX_FSMS and nvars <= MAX_VARS, \- (name, len(rm.objs), len(rm.fsms), nvars)+ nanims = sum(1 for o in rm.objs if _animator(o) or _unity_animator(o) or+ any(c.get("class") in ("WaveEffectControl", "SimpleSpriteFade") for c in o["c"]))+ assert len(rm.objs) <= MAX_OBJS and len(rm.fsms) <= MAX_FSMS and nvars <= MAX_VARS and nanims <= MAX_ANIMS, \+ (name, len(rm.objs), len(rm.fsms), nvars, nanims)BUILT[name] = rm# Unity Animators (a sprite swapped each frame): their clips as actors'for rm in BUILT.values():@@ -1576,8 +1668,29 @@ def room_blob(name, clip_index, sprites, owners=(), persist=None):for fi, slot, o, *semi in rm.persist:bits = 3 if slot & 0x80 else 1fsms += struct.pack("<BBH", fi, slot, persist.id(o.get("_scene", name), o["path"], bits, semi[0] if semi else False))+ # (folded sprites: their object, sprite, place from it, depth, scale, sorting, color, blend)+ folds = struct.pack("<H", len(rm.folds))+ for i, q in rm.folds:+ o = rm.objs[i]+ m = np.array(q["m3"]).reshape(3, 3)+ sx = float(np.hypot(m[0, 0], m[1, 0])) * (1 if m[0, 0] >= 0 else -1)+ sy = float(np.hypot(m[0, 1], m[1, 1])) * (1 if m[1, 1] >= 0 else -1)+ sr = next(c["v"] for c in q["c"])+ spr = sprites.id(q.get("_doc") or rm.d, sr["m_Sprite"], 1.0, max(abs(sx), abs(sy)))+ layer, order = ents._sorting(q)+ import scene+ blend = 0+ m0 = (sr.get("m_Materials") or [None])[0]+ if m0 and m0[1]:+ doc = q.get("_doc") or rm.d+ blend = {"alpha": 0, "add": 1, "screen": 2, "linearlight": 3, "overlay": 4, "multiply": 5}[+ scene.blend_of(unity.material(unity.ref_path(doc, m0[0]), m0[1])[1])]+ col = sr.get("m_Color") or {"r": 1, "g": 1, "b": 1, "a": 1}+ rgba = [max(0, min(255, int(round(col[k] * 255)))) for k in "rgba"]+ folds += struct.pack("<BBhfffffHhBBBBHH", i, 0, spr, q["pos"][0] - o["pos"][0], q["pos"][1] - o["pos"][1], q["pos"][2],+ sx, sy, layer, order, *rgba, blend, 0)head = struct.pack("<HHHH", len(rm.objs), len(rm.fsms), nmap, len(rm.persist))- return bytes(head + objs + clipmap + fsms)+ return bytes(head + objs + clipmap + fsms + folds)def tables(clip_index, prompt_text):@@ -1628,7 +1741,7 @@ PD_INT_CONST = {"permadeathMode": 0, "quakeLevel": 0, "screamLevel": 0}def owned(room):"""the room's objects the scripts have (and draw): (scene, object id)"""rm = BUILT.get(room)- return [(o.get("_scene", room), o.get("_raw", o["id"])) for o in rm.objs] if rm else []+ return [(o.get("_scene", room), o.get("_raw", o["id"])) for o in rm.objs + [q for _, q in rm.folds]] if rm else []def _const_bool(name):