Skip to content

Free games for graphing calculators: NumWorks, TI-Nspire CX, Casio fx-CG50 and soon TI-84 Plus CE. Balatro, Celeste, Hollow Knight, Minecraft and more.

Hollow Knight: the quick map, Cornifer, map updates at benches

Mason Chen23cc83854054
diff --git a/games/hollowknight/Makefile b/games/hollowknight/Makefile
index 69b44539..976fe1e1 100644
--- a/games/hollowknight/Makefile
+++ b/games/hollowknight/Makefile
@@ -9,7 +9,7 @@ CC = arm-none-eabi-gcc
NWLINK ?= npx --yes -- [email protected]
STRIP ?= arm-none-eabi-strip --strip-unneeded
BUILD_DIR = output
-GAME = 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/lzma/LzmaDec.c
+GAME = 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.c
SRC = $(GAME) src/plat_eadk.c src/main.c
HEADERS = $(wildcard src/*.h) ../common/epsilon_app.h ../common/epsilon_files.h
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.bin
index 2bf76e64..acdfb44c 100644
Binary files a/games/hollowknight/src/data.bin and b/games/hollowknight/src/data.bin differ
diff --git a/games/hollowknight/src/data.h b/games/hollowknight/src/data.h
index 14498907..e749390e 100644
--- a/games/hollowknight/src/data.h
+++ b/games/hollowknight/src/data.h
@@ -213,452 +213,461 @@
#define CLIP_STAGUI_STAG_BORDER_TOP_DOWN 153
#define CLIP_STAGUI_STAG_BORDER_BOTTOM_UP 154
#define CLIP_STAGUI_STAG_BORDER_BOTTOM_DOWN 155
-#define CLIP_GEOBUG_LAMP_BUG_IDLE 156
-#define CLIP_DIALOGUE_ARROW_UP 157
-#define CLIP_DIALOGUE_ARROW_DOWN 158
-#define CLIP_DIALOGUE_STOP_UP 159
-#define CLIP_DIALOGUE_STOP_DOWN 160
-#define CLIP_DIALOGUE_FLEUR_TOP_UP 161
-#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 162
-#define CLIP_DIALOGUE_FLEUR_BOT_UP 163
-#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 164
-#define CLIP_DIALOGUE_DREAM_UP 165
-#define CLIP_DIALOGUE_DREAM_DOWN 166
-#define CLIP_PROMPT_BLANK 167
-#define CLIP_PROMPT_DOWN 168
-#define CLIP_PROMPT_ENTER_DOWN 169
-#define CLIP_PROMPT_ENTER_IDLE 170
-#define CLIP_PROMPT_ENTER_UP 171
-#define CLIP_PROMPT_IDLE 172
-#define CLIP_PROMPT_LISTEN_DOWN 173
-#define CLIP_PROMPT_LISTEN_IDLE 174
-#define CLIP_PROMPT_LISTEN_UP 175
-#define CLIP_PROMPT_UP 176
-#define CLIP_SHADE_APPEAR 177
-#define CLIP_SHADE_CAST 178
-#define CLIP_SHADE_CAST_ANTIC 179
-#define CLIP_SHADE_CAST_CHARGE 180
-#define CLIP_SHADE_CAST_RING 181
-#define CLIP_SHADE_DEATH 182
-#define CLIP_SHADE_DEATH_GLOW 183
-#define CLIP_SHADE_DEATH_START 184
-#define CLIP_SHADE_DEPART 185
-#define CLIP_SHADE_FIREBALL 186
-#define CLIP_SHADE_FIREBALL_END 187
-#define CLIP_SHADE_FLY 188
-#define CLIP_SHADE_IDLE 189
-#define CLIP_SHADE_RETREAT_END 190
-#define CLIP_SHADE_RETREAT_START 191
-#define CLIP_SHADE_SLASH 192
-#define CLIP_SHADE_SLASH_ANTIC 193
-#define CLIP_SHADE_SLASH_CD 194
-#define CLIP_SHADE_SLASH_EFFECT 195
-#define CLIP_SHADE_STARTLE 196
-#define CLIP_SHADE_TURNTOFLY 197
-#define CLIP_SHADE_TURNTOIDLE 198
-#define CLIP_CRAWLER_WALK 199
-#define CLIP_CRAWLER_TURN 200
-#define CLIP_CRAWLER_IDLE 201
-#define CLIP_CRAWLER_DEATH_AIR 202
-#define CLIP_CRAWLER_DEATH_LAND 203
-#define CLIP_BUZZER_CHASE 204
-#define CLIP_BUZZER_IDLE 205
-#define CLIP_BUZZER_STARTLE 206
-#define CLIP_BUZZER_DEATH_AIR 207
-#define CLIP_BUZZER_DEATH_LAND 208
-#define CLIP_BUZZER_FLY 209
-#define CLIP_BUZZER_TURNTOFLY 210
-#define CLIP_BUZZER_TURNTOIDLE 211
-#define CLIP_TIKTIK_DEATH_AIR 212
-#define CLIP_TIKTIK_DEATH_LAND 213
-#define CLIP_TIKTIK_STUN 214
-#define CLIP_TIKTIK_WALK 215
-#define CLIP_GRUZZER_DEATH_AIR 216
-#define CLIP_GRUZZER_DEATH_LAND 217
-#define CLIP_GRUZZER_FLY 218
-#define CLIP_ASPID_DEATH_AIR 219
-#define CLIP_ASPID_FIRE_LONG 220
-#define CLIP_ASPID_FLY 221
-#define CLIP_ASPID_TURNTOFLY 222
-#define CLIP_BALDUR_DEATH_AIR 223
-#define CLIP_BALDUR_DEATH_LAND 224
-#define CLIP_BALDUR_IDLE 225
-#define CLIP_BALDUR_ROLL 226
-#define CLIP_BALDUR_START 227
-#define CLIP_BALDUR_STOP 228
-#define CLIP_ELDERBALDUR_CLOSE1 229
-#define CLIP_ELDERBALDUR_CLOSE2 230
-#define CLIP_ELDERBALDUR_CLOSED 231
-#define CLIP_ELDERBALDUR_DEATH 232
-#define CLIP_ELDERBALDUR_DEATH_STUN 233
-#define CLIP_ELDERBALDUR_HIT 234
-#define CLIP_ELDERBALDUR_IDLE 235
-#define CLIP_ELDERBALDUR_OPEN 236
-#define CLIP_ELDERBALDUR_SHOOT_ANTIC 237
-#define CLIP_ELDERBALDUR_SHOOT_CD 238
-#define CLIP_HUSK_ATTACK_ANTICIPATE 239
-#define CLIP_HUSK_ATTACK_COOLDOWN 240
-#define CLIP_HUSK_ATTACK_LUNGE 241
-#define CLIP_HUSK_DEATH_AIR 242
-#define CLIP_HUSK_DEATH_LAND 243
-#define CLIP_HUSK_IDLE 244
-#define CLIP_HUSK_TURN 245
-#define CLIP_HUSK_WALK 246
-#define CLIP_BARGER_ATTACK_ANTICIPATE 247
-#define CLIP_BARGER_ATTACK_COOLDOWN 248
-#define CLIP_BARGER_ATTACK_LUNGE 249
-#define CLIP_BARGER_DEATH_AIR 250
-#define CLIP_BARGER_DEATH_LAND 251
-#define CLIP_BARGER_IDLE 252
-#define CLIP_BARGER_TURN 253
-#define CLIP_BARGER_WALK 254
-#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 255
-#define CLIP_HORNHEAD_ATTACK_COOLDOWN 256
-#define CLIP_HORNHEAD_ATTACK_LUNGE 257
-#define CLIP_HORNHEAD_DEATH_AIR 258
-#define CLIP_HORNHEAD_DEATH_LAND 259
-#define CLIP_HORNHEAD_IDLE 260
-#define CLIP_HORNHEAD_TURN 261
-#define CLIP_HORNHEAD_WALK 262
-#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 263
-#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 264
-#define CLIP_MOSSRUNNER_ATTACK_LUNGE 265
-#define CLIP_MOSSRUNNER_DEATH_AIR 266
-#define CLIP_MOSSRUNNER_DEATH_LAND 267
-#define CLIP_MOSSRUNNER_IDLE 268
-#define CLIP_MOSSRUNNER_TURN 269
-#define CLIP_MOSSRUNNER_WALK 270
-#define CLIP_LEAPER_ATTACK 271
-#define CLIP_LEAPER_DEATH_AIR 272
-#define CLIP_LEAPER_DEATH_LAND 273
-#define CLIP_LEAPER_IDLE 274
-#define CLIP_LEAPER_LAND 275
-#define CLIP_LEAPER_TURN 276
-#define CLIP_LEAPER_WALK 277
-#define CLIP_GUARD_ANTICIPATE 278
-#define CLIP_GUARD_ATTACK2 279
-#define CLIP_GUARD_DEATH_AIR 280
-#define CLIP_GUARD_DEATH_LAND 281
-#define CLIP_GUARD_DORMANT 282
-#define CLIP_GUARD_IDLE 283
-#define CLIP_GUARD_RUN 284
-#define CLIP_GUARD_STARTLE 285
-#define CLIP_GUARD_STOMP_ANTIC 286
-#define CLIP_GUARD_STOMP_JUMP 287
-#define CLIP_GUARD_STOMP_LAND 288
-#define CLIP_GUARD_STOP_RUN 289
-#define CLIP_GUARD_STOP_WALK 290
-#define CLIP_GUARD_SWIPE 291
-#define CLIP_GUARD_TURN 292
-#define CLIP_GUARD_WAKE 293
-#define CLIP_GUARD_WALK 294
-#define CLIP_FK_ATTACK 295
-#define CLIP_FK_ATTACK_ANTIC 296
-#define CLIP_FK_ATTACK_RECOVER 297
-#define CLIP_FK_BLANK 298
-#define CLIP_FK_BODY 299
-#define CLIP_FK_DEATH_FALL 300
-#define CLIP_FK_DEATH_HEAD_1 301
-#define CLIP_FK_DEATH_HEAD_2 302
-#define CLIP_FK_DEATH_LAND 303
-#define CLIP_FK_DEATH_SPAZ 304
-#define CLIP_FK_IDLE 305
-#define CLIP_FK_JUMP 306
-#define CLIP_FK_JUMP_ANTIC 307
-#define CLIP_FK_JUMP_ATTACK_HIT_1 308
-#define CLIP_FK_JUMP_ATTACK_HIT_2 309
-#define CLIP_FK_JUMP_ATTACK_HIT_3 310
-#define CLIP_FK_JUMP_ATTACK_UP 311
-#define CLIP_FK_LAND 312
-#define CLIP_FK_RAGE 313
-#define CLIP_FK_RUN 314
-#define CLIP_FK_RUN_ANTIC 315
-#define CLIP_FK_STUN_HIT 316
-#define CLIP_FK_STUN_OPEN 317
-#define CLIP_FK_STUN_OPENED 318
-#define CLIP_FK_STUN_RECOVER 319
-#define CLIP_FK_STUN_ROLL 320
-#define CLIP_FK_STUN_ROLL_END 321
-#define CLIP_FK_TURN 322
-#define CLIP_FKHEAD_DEATH_LAND 323
-#define CLIP_FKHEAD_HEAD_HIT 324
-#define CLIP_FKHEAD_HEAD_IDLE 325
-#define CLIP_FKHEAD_HEAD_SPAZ 326
-#define CLIP_HATCHER_DEATH_AIR 327
-#define CLIP_HATCHER_DEATH_LAND 328
-#define CLIP_HATCHER_FIRE 329
-#define CLIP_HATCHER_FLY 330
-#define CLIP_HATCHLING_FLY 331
-#define CLIP_SLUG_BOUNCE 332
-#define CLIP_SLUG_DEATH_AIR 333
-#define CLIP_SLUG_DEATH_LAND 334
-#define CLIP_SLUG_IDLE_TODOWN 335
-#define CLIP_SLUG_IDLE_TOUP 336
-#define CLIP_SLUG_IDLE_UP 337
-#define CLIP_SLUG_RUN 338
-#define CLIP_SLUG_STARTLE 339
-#define CLIP_GFLY_BURST 340
-#define CLIP_GFLY_CHARGE 341
-#define CLIP_GFLY_CHARGE_ANTIC 342
-#define CLIP_GFLY_CHARGE_RECOVER 343
-#define CLIP_GFLY_DEATH 344
-#define CLIP_GFLY_FALL 345
-#define CLIP_GFLY_FLY 346
-#define CLIP_GFLY_GURGLE_LOOP 347
-#define CLIP_GFLY_GURGLE_ONCE 348
-#define CLIP_GFLY_SLAM_DOWN 349
-#define CLIP_GFLY_SLAM_END 350
-#define CLIP_GFLY_SLAM_UP 351
-#define CLIP_GFLY_SLEEP 352
-#define CLIP_GFLY_STOP 353
-#define CLIP_GFLY_WAKE 354
-#define CLIP_GFLY_WIGGLE 355
-#define CLIP_MOSSWALKER_APPEAR 356
-#define CLIP_MOSSWALKER_BURY 357
-#define CLIP_MOSSWALKER_DEATH_AIR 358
-#define CLIP_MOSSWALKER_DEATH_LAND 359
-#define CLIP_MOSSWALKER_SHAKE 360
-#define CLIP_MOSSWALKER_TURN 361
-#define CLIP_MOSSWALKER_WALK 362
-#define CLIP_PIGEON_FLY 363
-#define CLIP_PIGEON_IDLE_01 364
-#define CLIP_PIGEON_IDLE_02 365
-#define CLIP_PIGEON_IDLE_03 366
-#define CLIP_PLANTTRAP_DEATH 367
-#define CLIP_PLANTTRAP_IDLE 368
-#define CLIP_PLANTTRAP_RETRACT 369
-#define CLIP_PLANTTRAP_SNAP 370
-#define CLIP_PLANTTRAP_SNAP_READY 371
-#define CLIP_SHAKER_ATTACK 372
-#define CLIP_SHAKER_DEATH_AIR 373
-#define CLIP_SHAKER_DEATH_LAND 374
-#define CLIP_SHAKER_IDLE 375
-#define CLIP_SHAKER_TURN 376
-#define CLIP_SHAKER_WALK 377
-#define CLIP_MOSQUITO_ATTACK 378
-#define CLIP_MOSQUITO_ATTACK_ANTIC 379
-#define CLIP_MOSQUITO_DEATH_AIR 380
-#define CLIP_MOSQUITO_DEATH_LAND 381
-#define CLIP_MOSQUITO_IDLE 382
-#define CLIP_MOSQUITO_STARTLE 383
-#define CLIP_MOSQUITO_TURNTOIDLE 384
-#define CLIP_FATFLY_ATTACK 385
-#define CLIP_FATFLY_DEATH_AIR 386
-#define CLIP_FATFLY_DEATH_LAND 387
-#define CLIP_FATFLY_FLY 388
-#define CLIP_MOSSCHARGER_APPEAR 389
-#define CLIP_MOSSCHARGER_CHARGE 390
-#define CLIP_MOSSCHARGER_DEATH_AIR 391
-#define CLIP_MOSSCHARGER_DEATH_LAND 392
-#define CLIP_MOSSCHARGER_DISAPPEAR 393
-#define CLIP_MOSSCHARGER_ESCAPE 394
-#define CLIP_MOSSCHARGER_GET_UP 395
-#define CLIP_MOSSCHARGER_STUN 396
-#define CLIP_MOSSCHARGER_TURNRUN 397
-#define CLIP_MOSSKNIGHT_DEATH_AIR 398
-#define CLIP_MOSSKNIGHT_DEATH_LAND 399
-#define CLIP_MOSSKNIGHT_DORMANT_1 400
-#define CLIP_MOSSKNIGHT_DORMANT_2 401
-#define CLIP_MOSSKNIGHT_EVADE 402
-#define CLIP_MOSSKNIGHT_IDLE 403
-#define CLIP_MOSSKNIGHT_SHAKE 404
-#define CLIP_MOSSKNIGHT_SHIELD_FRONT 405
-#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 406
-#define CLIP_MOSSKNIGHT_SHIELD_TOP 407
-#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 408
-#define CLIP_MOSSKNIGHT_SHOOT 409
-#define CLIP_MOSSKNIGHT_SHOOT_END 410
-#define CLIP_MOSSKNIGHT_SLASH 411
-#define CLIP_MOSSKNIGHT_SLASH_2 412
-#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 413
-#define CLIP_MOSSKNIGHT_SLASH_EFFECT 414
-#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 415
-#define CLIP_MOSSKNIGHT_SLASH_END 416
-#define CLIP_MOSSKNIGHT_SLASH_QUICK 417
-#define CLIP_MOSSKNIGHT_TURN 418
-#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 419
-#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 420
-#define CLIP_MOSSKNIGHT_WAKE 421
-#define CLIP_MOSSKNIGHT_WALK 422
-#define CLIP_HORNET_A_DASH 423
-#define CLIP_HORNET_A_DASH_ANTIC 424
-#define CLIP_HORNET_AIR_DASH_EFFECT 425
-#define CLIP_HORNET_DEATH_AIR 426
-#define CLIP_HORNET_EVADE 427
-#define CLIP_HORNET_EVADE_ANTIC 428
-#define CLIP_HORNET_FALL 429
-#define CLIP_HORNET_FLASH 430
-#define CLIP_HORNET_FLOURISH 431
-#define CLIP_HORNET_G_DASH 432
-#define CLIP_HORNET_G_DASH_ANTIC 433
-#define CLIP_HORNET_G_DASH_EFFECT 434
-#define CLIP_HORNET_G_DASH_RECOVER1 435
-#define CLIP_HORNET_G_DASH_RECOVER2 436
-#define CLIP_HORNET_HARD_LAND 437
-#define CLIP_HORNET_IDLE 438
-#define CLIP_HORNET_JUMP 439
-#define CLIP_HORNET_JUMP_ANTIC 440
-#define CLIP_HORNET_LAND 441
-#define CLIP_HORNET_NEEDLE 442
-#define CLIP_HORNET_NEEDLE_THREAD 443
-#define CLIP_HORNET_RUN 444
-#define CLIP_HORNET_SPHERE_ANTIC_A 445
-#define CLIP_HORNET_SPHERE_ANTIC_G 446
-#define CLIP_HORNET_SPHERE_ATTACK 447
-#define CLIP_HORNET_SPHERE_BALL 448
-#define CLIP_HORNET_SPHERE_RECOVER_A 449
-#define CLIP_HORNET_SPHERE_RECOVER_G 450
-#define CLIP_HORNET_STUN 451
-#define CLIP_HORNET_STUN_AIR 452
-#define CLIP_HORNET_THROW 453
-#define CLIP_HORNET_THROW_ANTIC 454
-#define CLIP_HORNET_THROW_EFFECT 455
-#define CLIP_HORNET_THROW_RECOVER 456
-#define CLIP_HORNET_WALL_IMPACT 457
-#define CLIP_HORNET_WOUNDED 458
-#define CLIP_BGATE_BG_CLOSE_1 459
-#define CLIP_BGATE_BG_CLOSE_2 460
-#define CLIP_BGATE_BG_CLOSED 461
-#define CLIP_BGATE_BG_OPEN 462
-#define CLIP_BGATE_BG_OPENED 463
-#define CLIP_BGATE_BONE_GATE_CLOSE 464
-#define CLIP_BGATE_BONE_GATE_CLOSED 465
-#define CLIP_BGATE_BONE_GATE_OPEN 466
-#define CLIP_BGATE_BONE_GATE_OPENED 467
-#define CLIP_BGATE_GATE_IDLE 468
-#define CLIP_BGATE_GATE_OPEN 469
-#define CLIP_BGATE_GATE_OPENED 470
-#define CLIP_BGATE_PILLAR_IDLE 471
-#define CLIP_BGATE_PILLAR_OPENED 472
-#define CLIP_BGATE_SWITCH_ACTIVATED 473
-#define CLIP_BGATE_SWITCH_HIT 474
-#define CLIP_BGATE_SWITCH_IDLE 475
-#define CLIP_BGATE_TOLL_GATE_IDLE 476
-#define CLIP_BGATE_TOLL_GATE_OPEN 477
-#define CLIP_COCOON_COCOON_IDLE 478
-#define CLIP_COCOON_COCOON_SWEAT 479
-#define CLIP_COCOON_SCUTTLER_LAND 480
-#define CLIP_COCOON_SCUTTLER_RUN 481
-#define CLIP_FX_SPLAT 482
-#define CLIP_FX_SPLAT2 483
-#define CLIP_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 3367
+#define CLIP_MAPUI_IDLE 156
+#define CLIP_MAPUI_WALK 157
+#define CLIP_JOURNALMSG_MAP_WRITING 158
+#define CLIP_JOURNALMSG_MAP_COMPLETE 159
+#define CLIP_GEOBUG_LAMP_BUG_IDLE 160
+#define CLIP_DIALOGUE_ARROW_UP 161
+#define CLIP_DIALOGUE_ARROW_DOWN 162
+#define CLIP_DIALOGUE_STOP_UP 163
+#define CLIP_DIALOGUE_STOP_DOWN 164
+#define CLIP_DIALOGUE_FLEUR_TOP_UP 165
+#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 166
+#define CLIP_DIALOGUE_FLEUR_BOT_UP 167
+#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 168
+#define CLIP_DIALOGUE_DREAM_UP 169
+#define CLIP_DIALOGUE_DREAM_DOWN 170
+#define CLIP_PROMPT_BLANK 171
+#define CLIP_PROMPT_DOWN 172
+#define CLIP_PROMPT_ENTER_DOWN 173
+#define CLIP_PROMPT_ENTER_IDLE 174
+#define CLIP_PROMPT_ENTER_UP 175
+#define CLIP_PROMPT_IDLE 176
+#define CLIP_PROMPT_LISTEN_DOWN 177
+#define CLIP_PROMPT_LISTEN_IDLE 178
+#define CLIP_PROMPT_LISTEN_UP 179
+#define CLIP_PROMPT_UP 180
+#define CLIP_SHADE_APPEAR 181
+#define CLIP_SHADE_CAST 182
+#define CLIP_SHADE_CAST_ANTIC 183
+#define CLIP_SHADE_CAST_CHARGE 184
+#define CLIP_SHADE_CAST_RING 185
+#define CLIP_SHADE_DEATH 186
+#define CLIP_SHADE_DEATH_GLOW 187
+#define CLIP_SHADE_DEATH_START 188
+#define CLIP_SHADE_DEPART 189
+#define CLIP_SHADE_FIREBALL 190
+#define CLIP_SHADE_FIREBALL_END 191
+#define CLIP_SHADE_FLY 192
+#define CLIP_SHADE_IDLE 193
+#define CLIP_SHADE_RETREAT_END 194
+#define CLIP_SHADE_RETREAT_START 195
+#define CLIP_SHADE_SLASH 196
+#define CLIP_SHADE_SLASH_ANTIC 197
+#define CLIP_SHADE_SLASH_CD 198
+#define CLIP_SHADE_SLASH_EFFECT 199
+#define CLIP_SHADE_STARTLE 200
+#define CLIP_SHADE_TURNTOFLY 201
+#define CLIP_SHADE_TURNTOIDLE 202
+#define CLIP_CRAWLER_WALK 203
+#define CLIP_CRAWLER_TURN 204
+#define CLIP_CRAWLER_IDLE 205
+#define CLIP_CRAWLER_DEATH_AIR 206
+#define CLIP_CRAWLER_DEATH_LAND 207
+#define CLIP_BUZZER_CHASE 208
+#define CLIP_BUZZER_IDLE 209
+#define CLIP_BUZZER_STARTLE 210
+#define CLIP_BUZZER_DEATH_AIR 211
+#define CLIP_BUZZER_DEATH_LAND 212
+#define CLIP_BUZZER_FLY 213
+#define CLIP_BUZZER_TURNTOFLY 214
+#define CLIP_BUZZER_TURNTOIDLE 215
+#define CLIP_TIKTIK_DEATH_AIR 216
+#define CLIP_TIKTIK_DEATH_LAND 217
+#define CLIP_TIKTIK_STUN 218
+#define CLIP_TIKTIK_WALK 219
+#define CLIP_GRUZZER_DEATH_AIR 220
+#define CLIP_GRUZZER_DEATH_LAND 221
+#define CLIP_GRUZZER_FLY 222
+#define CLIP_ASPID_DEATH_AIR 223
+#define CLIP_ASPID_FIRE_LONG 224
+#define CLIP_ASPID_FLY 225
+#define CLIP_ASPID_TURNTOFLY 226
+#define CLIP_BALDUR_DEATH_AIR 227
+#define CLIP_BALDUR_DEATH_LAND 228
+#define CLIP_BALDUR_IDLE 229
+#define CLIP_BALDUR_ROLL 230
+#define CLIP_BALDUR_START 231
+#define CLIP_BALDUR_STOP 232
+#define CLIP_ELDERBALDUR_CLOSE1 233
+#define CLIP_ELDERBALDUR_CLOSE2 234
+#define CLIP_ELDERBALDUR_CLOSED 235
+#define CLIP_ELDERBALDUR_DEATH 236
+#define CLIP_ELDERBALDUR_DEATH_STUN 237
+#define CLIP_ELDERBALDUR_HIT 238
+#define CLIP_ELDERBALDUR_IDLE 239
+#define CLIP_ELDERBALDUR_OPEN 240
+#define CLIP_ELDERBALDUR_SHOOT_ANTIC 241
+#define CLIP_ELDERBALDUR_SHOOT_CD 242
+#define CLIP_HUSK_ATTACK_ANTICIPATE 243
+#define CLIP_HUSK_ATTACK_COOLDOWN 244
+#define CLIP_HUSK_ATTACK_LUNGE 245
+#define CLIP_HUSK_DEATH_AIR 246
+#define CLIP_HUSK_DEATH_LAND 247
+#define CLIP_HUSK_IDLE 248
+#define CLIP_HUSK_TURN 249
+#define CLIP_HUSK_WALK 250
+#define CLIP_BARGER_ATTACK_ANTICIPATE 251
+#define CLIP_BARGER_ATTACK_COOLDOWN 252
+#define CLIP_BARGER_ATTACK_LUNGE 253
+#define CLIP_BARGER_DEATH_AIR 254
+#define CLIP_BARGER_DEATH_LAND 255
+#define CLIP_BARGER_IDLE 256
+#define CLIP_BARGER_TURN 257
+#define CLIP_BARGER_WALK 258
+#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 259
+#define CLIP_HORNHEAD_ATTACK_COOLDOWN 260
+#define CLIP_HORNHEAD_ATTACK_LUNGE 261
+#define CLIP_HORNHEAD_DEATH_AIR 262
+#define CLIP_HORNHEAD_DEATH_LAND 263
+#define CLIP_HORNHEAD_IDLE 264
+#define CLIP_HORNHEAD_TURN 265
+#define CLIP_HORNHEAD_WALK 266
+#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 267
+#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 268
+#define CLIP_MOSSRUNNER_ATTACK_LUNGE 269
+#define CLIP_MOSSRUNNER_DEATH_AIR 270
+#define CLIP_MOSSRUNNER_DEATH_LAND 271
+#define CLIP_MOSSRUNNER_IDLE 272
+#define CLIP_MOSSRUNNER_TURN 273
+#define CLIP_MOSSRUNNER_WALK 274
+#define CLIP_LEAPER_ATTACK 275
+#define CLIP_LEAPER_DEATH_AIR 276
+#define CLIP_LEAPER_DEATH_LAND 277
+#define CLIP_LEAPER_IDLE 278
+#define CLIP_LEAPER_LAND 279
+#define CLIP_LEAPER_TURN 280
+#define CLIP_LEAPER_WALK 281
+#define CLIP_GUARD_ANTICIPATE 282
+#define CLIP_GUARD_ATTACK2 283
+#define CLIP_GUARD_DEATH_AIR 284
+#define CLIP_GUARD_DEATH_LAND 285
+#define CLIP_GUARD_DORMANT 286
+#define CLIP_GUARD_IDLE 287
+#define CLIP_GUARD_RUN 288
+#define CLIP_GUARD_STARTLE 289
+#define CLIP_GUARD_STOMP_ANTIC 290
+#define CLIP_GUARD_STOMP_JUMP 291
+#define CLIP_GUARD_STOMP_LAND 292
+#define CLIP_GUARD_STOP_RUN 293
+#define CLIP_GUARD_STOP_WALK 294
+#define CLIP_GUARD_SWIPE 295
+#define CLIP_GUARD_TURN 296
+#define CLIP_GUARD_WAKE 297
+#define CLIP_GUARD_WALK 298
+#define CLIP_FK_ATTACK 299
+#define CLIP_FK_ATTACK_ANTIC 300
+#define CLIP_FK_ATTACK_RECOVER 301
+#define CLIP_FK_BLANK 302
+#define CLIP_FK_BODY 303
+#define CLIP_FK_DEATH_FALL 304
+#define CLIP_FK_DEATH_HEAD_1 305
+#define CLIP_FK_DEATH_HEAD_2 306
+#define CLIP_FK_DEATH_LAND 307
+#define CLIP_FK_DEATH_SPAZ 308
+#define CLIP_FK_IDLE 309
+#define CLIP_FK_JUMP 310
+#define CLIP_FK_JUMP_ANTIC 311
+#define CLIP_FK_JUMP_ATTACK_HIT_1 312
+#define CLIP_FK_JUMP_ATTACK_HIT_2 313
+#define CLIP_FK_JUMP_ATTACK_HIT_3 314
+#define CLIP_FK_JUMP_ATTACK_UP 315
+#define CLIP_FK_LAND 316
+#define CLIP_FK_RAGE 317
+#define CLIP_FK_RUN 318
+#define CLIP_FK_RUN_ANTIC 319
+#define CLIP_FK_STUN_HIT 320
+#define CLIP_FK_STUN_OPEN 321
+#define CLIP_FK_STUN_OPENED 322
+#define CLIP_FK_STUN_RECOVER 323
+#define CLIP_FK_STUN_ROLL 324
+#define CLIP_FK_STUN_ROLL_END 325
+#define CLIP_FK_TURN 326
+#define CLIP_FKHEAD_DEATH_LAND 327
+#define CLIP_FKHEAD_HEAD_HIT 328
+#define CLIP_FKHEAD_HEAD_IDLE 329
+#define CLIP_FKHEAD_HEAD_SPAZ 330
+#define CLIP_HATCHER_DEATH_AIR 331
+#define CLIP_HATCHER_DEATH_LAND 332
+#define CLIP_HATCHER_FIRE 333
+#define CLIP_HATCHER_FLY 334
+#define CLIP_HATCHLING_FLY 335
+#define CLIP_SLUG_BOUNCE 336
+#define CLIP_SLUG_DEATH_AIR 337
+#define CLIP_SLUG_DEATH_LAND 338
+#define CLIP_SLUG_IDLE_TODOWN 339
+#define CLIP_SLUG_IDLE_TOUP 340
+#define CLIP_SLUG_IDLE_UP 341
+#define CLIP_SLUG_RUN 342
+#define CLIP_SLUG_STARTLE 343
+#define CLIP_GFLY_BURST 344
+#define CLIP_GFLY_CHARGE 345
+#define CLIP_GFLY_CHARGE_ANTIC 346
+#define CLIP_GFLY_CHARGE_RECOVER 347
+#define CLIP_GFLY_DEATH 348
+#define CLIP_GFLY_FALL 349
+#define CLIP_GFLY_FLY 350
+#define CLIP_GFLY_GURGLE_LOOP 351
+#define CLIP_GFLY_GURGLE_ONCE 352
+#define CLIP_GFLY_SLAM_DOWN 353
+#define CLIP_GFLY_SLAM_END 354
+#define CLIP_GFLY_SLAM_UP 355
+#define CLIP_GFLY_SLEEP 356
+#define CLIP_GFLY_STOP 357
+#define CLIP_GFLY_WAKE 358
+#define CLIP_GFLY_WIGGLE 359
+#define CLIP_MOSSWALKER_APPEAR 360
+#define CLIP_MOSSWALKER_BURY 361
+#define CLIP_MOSSWALKER_DEATH_AIR 362
+#define CLIP_MOSSWALKER_DEATH_LAND 363
+#define CLIP_MOSSWALKER_SHAKE 364
+#define CLIP_MOSSWALKER_TURN 365
+#define CLIP_MOSSWALKER_WALK 366
+#define CLIP_PIGEON_FLY 367
+#define CLIP_PIGEON_IDLE_01 368
+#define CLIP_PIGEON_IDLE_02 369
+#define CLIP_PIGEON_IDLE_03 370
+#define CLIP_PLANTTRAP_DEATH 371
+#define CLIP_PLANTTRAP_IDLE 372
+#define CLIP_PLANTTRAP_RETRACT 373
+#define CLIP_PLANTTRAP_SNAP 374
+#define CLIP_PLANTTRAP_SNAP_READY 375
+#define CLIP_SHAKER_ATTACK 376
+#define CLIP_SHAKER_DEATH_AIR 377
+#define CLIP_SHAKER_DEATH_LAND 378
+#define CLIP_SHAKER_IDLE 379
+#define CLIP_SHAKER_TURN 380
+#define CLIP_SHAKER_WALK 381
+#define CLIP_MOSQUITO_ATTACK 382
+#define CLIP_MOSQUITO_ATTACK_ANTIC 383
+#define CLIP_MOSQUITO_DEATH_AIR 384
+#define CLIP_MOSQUITO_DEATH_LAND 385
+#define CLIP_MOSQUITO_IDLE 386
+#define CLIP_MOSQUITO_STARTLE 387
+#define CLIP_MOSQUITO_TURNTOIDLE 388
+#define CLIP_FATFLY_ATTACK 389
+#define CLIP_FATFLY_DEATH_AIR 390
+#define CLIP_FATFLY_DEATH_LAND 391
+#define CLIP_FATFLY_FLY 392
+#define CLIP_MOSSCHARGER_APPEAR 393
+#define CLIP_MOSSCHARGER_CHARGE 394
+#define CLIP_MOSSCHARGER_DEATH_AIR 395
+#define CLIP_MOSSCHARGER_DEATH_LAND 396
+#define CLIP_MOSSCHARGER_DISAPPEAR 397
+#define CLIP_MOSSCHARGER_ESCAPE 398
+#define CLIP_MOSSCHARGER_GET_UP 399
+#define CLIP_MOSSCHARGER_STUN 400
+#define CLIP_MOSSCHARGER_TURNRUN 401
+#define CLIP_MOSSKNIGHT_DEATH_AIR 402
+#define CLIP_MOSSKNIGHT_DEATH_LAND 403
+#define CLIP_MOSSKNIGHT_DORMANT_1 404
+#define CLIP_MOSSKNIGHT_DORMANT_2 405
+#define CLIP_MOSSKNIGHT_EVADE 406
+#define CLIP_MOSSKNIGHT_IDLE 407
+#define CLIP_MOSSKNIGHT_SHAKE 408
+#define CLIP_MOSSKNIGHT_SHIELD_FRONT 409
+#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 410
+#define CLIP_MOSSKNIGHT_SHIELD_TOP 411
+#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 412
+#define CLIP_MOSSKNIGHT_SHOOT 413
+#define CLIP_MOSSKNIGHT_SHOOT_END 414
+#define CLIP_MOSSKNIGHT_SLASH 415
+#define CLIP_MOSSKNIGHT_SLASH_2 416
+#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 417
+#define CLIP_MOSSKNIGHT_SLASH_EFFECT 418
+#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 419
+#define CLIP_MOSSKNIGHT_SLASH_END 420
+#define CLIP_MOSSKNIGHT_SLASH_QUICK 421
+#define CLIP_MOSSKNIGHT_TURN 422
+#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 423
+#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 424
+#define CLIP_MOSSKNIGHT_WAKE 425
+#define CLIP_MOSSKNIGHT_WALK 426
+#define CLIP_HORNET_A_DASH 427
+#define CLIP_HORNET_A_DASH_ANTIC 428
+#define CLIP_HORNET_AIR_DASH_EFFECT 429
+#define CLIP_HORNET_DEATH_AIR 430
+#define CLIP_HORNET_EVADE 431
+#define CLIP_HORNET_EVADE_ANTIC 432
+#define CLIP_HORNET_FALL 433
+#define CLIP_HORNET_FLASH 434
+#define CLIP_HORNET_FLOURISH 435
+#define CLIP_HORNET_G_DASH 436
+#define CLIP_HORNET_G_DASH_ANTIC 437
+#define CLIP_HORNET_G_DASH_EFFECT 438
+#define CLIP_HORNET_G_DASH_RECOVER1 439
+#define CLIP_HORNET_G_DASH_RECOVER2 440
+#define CLIP_HORNET_HARD_LAND 441
+#define CLIP_HORNET_IDLE 442
+#define CLIP_HORNET_JUMP 443
+#define CLIP_HORNET_JUMP_ANTIC 444
+#define CLIP_HORNET_LAND 445
+#define CLIP_HORNET_NEEDLE 446
+#define CLIP_HORNET_NEEDLE_THREAD 447
+#define CLIP_HORNET_RUN 448
+#define CLIP_HORNET_SPHERE_ANTIC_A 449
+#define CLIP_HORNET_SPHERE_ANTIC_G 450
+#define CLIP_HORNET_SPHERE_ATTACK 451
+#define CLIP_HORNET_SPHERE_BALL 452
+#define CLIP_HORNET_SPHERE_RECOVER_A 453
+#define CLIP_HORNET_SPHERE_RECOVER_G 454
+#define CLIP_HORNET_STUN 455
+#define CLIP_HORNET_STUN_AIR 456
+#define CLIP_HORNET_THROW 457
+#define CLIP_HORNET_THROW_ANTIC 458
+#define CLIP_HORNET_THROW_EFFECT 459
+#define CLIP_HORNET_THROW_RECOVER 460
+#define CLIP_HORNET_WALL_IMPACT 461
+#define CLIP_HORNET_WOUNDED 462
+#define CLIP_BGATE_BG_CLOSE_1 463
+#define CLIP_BGATE_BG_CLOSE_2 464
+#define CLIP_BGATE_BG_CLOSED 465
+#define CLIP_BGATE_BG_OPEN 466
+#define CLIP_BGATE_BG_OPENED 467
+#define CLIP_BGATE_BONE_GATE_CLOSE 468
+#define CLIP_BGATE_BONE_GATE_CLOSED 469
+#define CLIP_BGATE_BONE_GATE_OPEN 470
+#define CLIP_BGATE_BONE_GATE_OPENED 471
+#define CLIP_BGATE_GATE_IDLE 472
+#define CLIP_BGATE_GATE_OPEN 473
+#define CLIP_BGATE_GATE_OPENED 474
+#define CLIP_BGATE_PILLAR_IDLE 475
+#define CLIP_BGATE_PILLAR_OPENED 476
+#define CLIP_BGATE_SWITCH_ACTIVATED 477
+#define CLIP_BGATE_SWITCH_HIT 478
+#define CLIP_BGATE_SWITCH_IDLE 479
+#define CLIP_BGATE_TOLL_GATE_IDLE 480
+#define CLIP_BGATE_TOLL_GATE_OPEN 481
+#define CLIP_COCOON_COCOON_IDLE 482
+#define CLIP_COCOON_COCOON_SWEAT 483
+#define CLIP_COCOON_SCUTTLER_LAND 484
+#define CLIP_COCOON_SCUTTLER_RUN 485
+#define CLIP_FX_SPLAT 486
+#define CLIP_FX_SPLAT2 487
+#define CLIP_FX_SWORD 488
+#define CLIP_FIREBALL_BLAST 489
+#define CLIP_FIREBALL_BALL 490
+#define CLIP_FIREBALL_BALL_END 491
+#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 492
+#define CLIP_DRIP_IDLE 493
+#define CLIP_DRIP_DRIP 494
+#define CLIP_DRIP_FALL 495
+#define CLIP_DRIP_IMPACT 496
+#define CLIP_HORNETCS_EVADE 497
+#define CLIP_HORNETCS_EVADE_ANTIC 498
+#define CLIP_HORNETCS_FALL 499
+#define CLIP_HORNETCS_HARPOON_SIDE 500
+#define CLIP_HORNETCS_IDLE 501
+#define CLIP_HORNETCS_JUMP_FULL 502
+#define CLIP_HORNETCS_POINT 503
+#define CLIP_HORNETCS_RUN 504
+#define CLIP_HORNETCS_SOFT_LAND 505
+#define CLIP_HORNETCS_THREAD_1 506
+#define CLIP_HORNETCS_THROW_SIDE 507
+#define CLIP_HORNETCS_THROW_SIDE_START 508
+#define CLIP_HORNETCS_TURN 509
+#define CLIP_HORNETCS_TURNTOIDLE 510
+#define CLIP_BULLET_IDLE 511
+#define CLIP_BULLET_IMPACT 512
+#define CLIP_BULLET_SHOCKWAVE_SPURT 513
+#define CLIP_PROP0_WATERFALL_LOOP 514
+#define CLIP_PROP1_TORCH2 515
+#define CLIP_PROP1_TORCH3 516
+#define CLIP_VM0_FLOWER 517
+#define CLIP_VM0_IDLE 518
+#define CLIP_VM0_REACH 519
+#define CLIP_VM0_REACH_TO_IDLE 520
+#define CLIP_VM0_TALK_LEFT 521
+#define CLIP_VM0_TALK_RIGHT 522
+#define CLIP_VM0_TURN_LEFT 523
+#define CLIP_VM0_TURN_RIGHT 524
+#define CLIP_VM2_IDLE 525
+#define CLIP_VM2_LOOKLEFT 526
+#define CLIP_VM2_LOOKRIGHT 527
+#define CLIP_VM3_IDLE 528
+#define CLIP_VM3_TALK 529
+#define CLIP_VM3_TALK_END 530
+#define CLIP_VM4_IDLE 531
+#define CLIP_VM4_LOOKLEFT 532
+#define CLIP_VM4_LOOKRIGHT 533
+#define CLIP_VM4_SIT 534
+#define CLIP_VM4_SIT_TALK 535
+#define CLIP_VM4_SIT_TALK_END 536
+#define CLIP_VM5_ARRIVE 537
+#define CLIP_VM5_ARRIVE_SMOKE 538
+#define CLIP_VM5_IDLE 539
+#define CLIP_VM6_BELL_IDLE 540
+#define CLIP_VM6_BELL_RING_R 541
+#define CLIP_VM6_BELL_STAND 542
+#define CLIP_VM6_BELL_STAND_APPEAR 543
+#define CLIP_VM6_BOX_DISAPPEAR 544
+#define CLIP_VM6_BOX_DISAPPEAR_QUICK 545
+#define CLIP_VM6_BOX_IDLE 546
+#define CLIP_VM6_FRONT 547
+#define CLIP_VM6_GRATE_DISAPPEAR 548
+#define CLIP_VM6_GRATE_IDLE 549
+#define CLIP_VM8_DAZED 550
+#define CLIP_VM8_IDLE 551
+#define CLIP_VM8_TURN_L 552
+#define CLIP_VM8_TURN_R 553
+#define CLIP_VM8_WAKE 554
+#define CLIP_VM11_HEGEMOL_CAST 555
+#define CLIP_VM11_HEGEMOL_IDLE 556
+#define CLIP_VM11_LURIEN_CAST 557
+#define CLIP_VM11_LURIEN_IDLE 558
+#define CLIP_VM11_MONOMON_CAST 559
+#define CLIP_VM11_MONOMON_IDLE 560
+#define CLIP_VM12_IDLE 561
+#define CLIP_VM12_SIT_IDLE 562
+#define CLIP_VM12_SIT_TALK 563
+#define CLIP_VM12_SIT_TALK_END 564
+#define CLIP_VM12_SUMMON 565
+#define CLIP_VM12_TALK 566
+#define CLIP_VM12_TALK_END 567
+#define CLIP_VM12_TURN 568
+#define CLIP_VM14_IDLE 569
+#define CLIP_VM14_LOOK_LEFT 570
+#define CLIP_VM14_LOOK_RIGHT 571
+#define CLIP_VM14_TALK_CONVO_END 572
+#define CLIP_VM14_TALK_CONVO_START 573
+#define CLIP_VM14_TALK_SHOP_END 574
+#define CLIP_VM14_TALK_SHOP_START 575
+#define CLIP_VM15_IDLE 576
+#define CLIP_VM15_SHOP_END 577
+#define CLIP_VM15_SHOP_START 578
+#define CLIP_VM15_TALK_END 579
+#define CLIP_VM15_TALK_START 580
+#define CLIP_VM16_CRY 581
+#define CLIP_VM16_CRY_TURN 582
+#define CLIP_VM16_FREED 583
+#define CLIP_VM16_HOME_BOUNCE 584
+#define CLIP_VM16_HOME_WAVE 585
+#define CLIP_VM16_IDLE 586
+#define CLIP_VM17_CRUMBLE 587
+#define CLIP_VM17_IDLE 588
+#define CLIP_VM18_BECKON 589
+#define CLIP_VM18_CHEER 590
+#define CLIP_VM18_CRY 591
+#define CLIP_VM18_GIFT 592
+#define CLIP_VM18_IDLE 593
+#define CLIP_VM20_RIPPLE_WATER 594
+#define CLIP_VM21_IDLE 595
+#define CLIP_VM21_TALK_L 596
+#define CLIP_VM21_TALK_L_END 597
+#define CLIP_VM21_TALK_R 598
+#define CLIP_VM21_TALK_R_END 599
+#define CLIP_ANIM0_STAG_DOOR_OPEN00 600
+#define CLIP_ANIM1_DASH_CLOAK_CORPSE000 601
+#define CLIP_ANIM2_GROUND_PLINK_0 602
+#define CLIP_ANIM3_FIREBALL_COLLECT_ANIM 603
+#define SPRITE_HERO_LIGHT 2991
+#define SPRITE_DIALOGUE_BACKBOARD 2992
+#define SPRITE_PROMPT_SHADOW 2993
+#define SPRITE_CORPSE_NAIL 2994
+#define SPRITE_FK_BARREL 2995
+#define SPRITE_FK_STAFF 2996
+#define SPRITE_DIGIT0 3493
#define STYLE_DIALOGUE 0
#define STYLE_PROMPT 1
#define STYLE_TITLE_L 2
@@ -706,21 +715,21 @@
#define EK_MOSSKNIGHT 28
#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 96
-#define TXT_PROMPT_REST 97
-#define TXT_PROMPT_INSPECT 98
-#define TXT_PROMPT_ENTER 99
-#define TXT_PROMPT_SIT 100
-#define TXT_PROMPT_SHOP 101
-#define TXT_PROMPT_TRAVEL 102
-#define TXT_PROMPT_ASCEND 103
-#define TXT_PROMPT_DESCEND 104
-#define TXT_PROMPT_EXIT 105
-#define TXT_PROMPT_ACCEPT 106
-#define TXT_PROMPT_TRADE 107
-#define TXT_PROMPT_WATCH 108
-#define TXT_PROMPT_CHALLENGE 109
+#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 204, 203, -1, -1, -1, -1, -1, -1, -1, -1, 206, 207}}, {EF_BUZZER, {209, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 211, 212}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 219, 218, -1, -1, -1, -1, -1, -1, -1, 216, 217}}, {EF_BOUNCER, {-1, -1, -1, 222, -1, -1, -1, -1, -1, -1, -1, 220, 221}}, {EF_SPITTER, {-1, -1, -1, 225, 226, 224, -1, -1, -1, -1, -1, 223, -1}}, {EF_ROLLER, {229, -1, -1, 231, 230, 232, -1, -1, -1, -1, -1, 227, 228}}, {EF_BLOCKER, {239, -1, -1, 235, 240, 233, 234, 241, 242, 238, 237, -1, 236}}, {EF_HUSK, {248, 249, 250, 243, 245, 244, -1, -1, -1, -1, -1, 246, 247}}, {EF_HUSK, {256, 257, 258, 251, 253, 252, -1, -1, -1, -1, -1, 254, 255}}, {EF_HUSK, {264, 265, 266, 259, 261, 260, -1, -1, -1, -1, -1, 262, 263}}, {EF_HUSK, {272, 273, 274, 267, 269, 268, -1, -1, -1, -1, -1, 270, 271}}, {EF_LEAPER, {278, 280, 281, 275, 279, -1, -1, -1, -1, -1, -1, 276, 277}}, {EF_GUARD, {287, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 284, 285}}, {EF_FK, {309, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 307}}, {EF_FKHEAD, {329, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 327}}, {EF_HATCHER, {-1, -1, -1, 334, 333, -1, -1, -1, -1, -1, -1, 331, 332}}, {EF_HATCHLING, {-1, -1, -1, 335, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {341, -1, -1, 339, 340, 343, 342, 336, -1, -1, -1, 337, 338}}, {EF_GFLY, {356, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 365, 366, 364, 360, 361, -1, -1, -1, -1, -1, 362, 363}}, {EF_PIGEON, {-1, -1, -1, 368, 369, 370, 367, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {372, -1, -1, 375, 374, 373, -1, -1, -1, -1, -1, 371, -1}}, {EF_SHAKER, {379, 380, 381, 376, -1, -1, -1, -1, -1, -1, -1, 377, 378}}, {EF_MOSQUITO, {386, -1, -1, 388, 387, 383, 382, -1, -1, -1, -1, 384, 385}}, {EF_FATFLY, {392, -1, -1, 389, -1, -1, -1, -1, -1, -1, -1, 390, 391}}, {EF_MOSSCHARGER, {-1, -1, -1, 393, 394, 397, 400, 399, 401, 398, -1, 395, 396}}, {EF_MOSSKNIGHT, {407, 422, 426, -1, -1, -1, -1, -1, -1, -1, -1, 402, 403}}, {EF_HORNET, {442, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 430, -1}}}
+#define TXT_PROMPT_LISTEN 108
+#define TXT_PROMPT_REST 109
+#define TXT_PROMPT_INSPECT 110
+#define TXT_PROMPT_ENTER 111
+#define TXT_PROMPT_SIT 112
+#define TXT_PROMPT_SHOP 113
+#define TXT_PROMPT_TRAVEL 114
+#define TXT_PROMPT_ASCEND 115
+#define TXT_PROMPT_DESCEND 116
+#define TXT_PROMPT_EXIT 117
+#define TXT_PROMPT_ACCEPT 118
+#define TXT_PROMPT_TRADE 119
+#define TXT_PROMPT_WATCH 120
+#define TXT_PROMPT_CHALLENGE 121
#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
@@ -854,6 +863,12 @@
#define VMOP_DIALOGUEPLACE 129
#define VMOP_STOPPAUSE 130
#define VMOP_GETFSMBOOL 131
+#define VMOP_CONVERTINTTOFLOAT 132
+#define VMOP_CONVERTFLOATTOINT 133
+#define VMOP_SENDEVENTBYSCALE 134
+#define VMOP_LISTENFORQUICKMAP 135
+#define VMOP_MAPUPDATEMSG 136
+#define VMOP_UPDATEGAMEMAP 137
#define VMEV_FINISHED 0
#define VMEV_CONVO_FINISH 1
#define VMEV_CONVO_START 2
@@ -898,11 +913,13 @@
#define VMEV_UNCOVER 41
#define VMEV_UP 42
#define VMEV_DOWN 43
+#define VMEV_FIRST_MAP_UP 44
+#define VMEV_FIRST_MAP_DOWN 45
#define VMSTR_NPC_TITLE 14
-#define VMSTR_VISITED 599
-#define VMSTR_DISPLAY_RIGHT 600
+#define VMSTR_VISITED 636
+#define VMSTR_DISPLAY_RIGHT 637
#define VMSTR_HORNET_SAVER 201
-#define VMSTR_ITEM 509
+#define VMSTR_ITEM 545
#define STR_ATTACK_RANGE 23
#define STR_EVADE_RANGE 49
#define STR_SPIT_RANGE 50
@@ -931,72 +948,72 @@
#define TITLE_TISO_NC 18
#define TITLE_CHARM_SLUG 19
#define NUM_TITLES 20
-#define TITLE_TABLE {{110, 111, -1, -1}, {112, 113, 114, -1}, {115, 116, -1, 117}, {118, 119, -1, 120}, {121, 122, -1, 123}, {124, 125, -1, -1}, {126, 127, 128, -1}, {129, 130, -1, -1}, {131, 132, -1, -1}, {133, 134, -1, -1}, {135, 136, -1, -1}, {137, 138, -1, -1}, {139, 140, -1, -1}, {141, 142, -1, -1}, {143, 144, -1, 145}, {146, 147, -1, 148}, {146, 147, -1, 149}, {150, 151, 152, -1}, {150, 151, -1, -1}, {153, 154, -1, 155}}
-#define SPRITE_FLEUR_TOP 2937
+#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}}
+#define SPRITE_FLEUR_TOP 2997
#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 2938
+#define SPRITE_FLEUR_BOT 2998
#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 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 SPRITE_MSG_BG 2999
+#define SPRITE_MSG_STOP 3000
+#define SPRITE_MSG_FLEUR 3001
+#define SPRITE_MSG_KEY 3002
+#define SPRITE_MSG_ICON_FIREBALL 3003
+#define SPRITE_MSG_ICON_DASH 3004
+#define SPRITE_GRASS_BALL 3005
+#define SPRITE_SOUL_ORB 3006
#define SOUL_ORB_SORT {13, 0}
-#define MSG_TABLE {{156, 157, 158, 159, 160, 161}, {162, 163, 164, 165, 166, 167}}
-#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 FOCUS_PROMPT_BG {2950, 0.0000f, -1.7900f, 1.0000f, 1.0000f}
-#define FOCUS_PROMPT_TEXTS {{168, 0.1765f, -2.3773f, 0}, {169, 0.1765f, -3.1983f, 0}, {170, -0.0488f, -4.1348f, 1}, {171, 0.2240f, -5.2114f, 0}}
-#define FOCUS_PROMPT_KEY {161, 0.4659f, -4.4341f}
-#define NOTICE_ICONS {2951, 2952, 2953}
+#define MSG_TABLE {{168, 169, 170, 171, 172, 173}, {174, 175, 176, 177, 178, 179}}
+#define NOTICE_BACKBOARD {3007, 1.0000f, 0.6931f}
+#define TUTE_FLEUR {3001, 1.0000f, 1.0000f}
+#define TUTE_BACKBOARD {3008, 1.0000f, 0.9560f}
+#define TUTE_IMAGE {3009, 1.0000f, 1.0000f}
+#define TUTE_STOP {3000, 1.0000f, 1.0000f}
+#define FOCUS_PROMPT_BG {3010, 0.0000f, -1.7900f, 1.0000f, 1.0000f}
+#define FOCUS_PROMPT_TEXTS {{180, 0.1765f, -2.3773f, 0}, {181, 0.1765f, -3.1983f, 0}, {182, -0.0488f, -4.1348f, 1}, {183, 0.2240f, -5.2114f, 0}}
+#define FOCUS_PROMPT_KEY {173, 0.4659f, -4.4341f}
+#define NOTICE_ICONS {3011, 3012, 3013, 3014}
#define CHARM_ICON_K 1.5000f
-#define CHARM_ICONS {-1, 2954, 2955, 2956, 2957, -1, 2958, 2959, 2960, -1, -1, -1, -1, -1, 2961, -1, -1, -1, 2962, 2963, 2964, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define CHARM_NAMES {-1, 172, 173, 174, 175, -1, 176, 177, 178, -1, -1, -1, -1, -1, 179, -1, -1, -1, 180, 181, 182, -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 183
-#define TXT_CHARM_TUTE_SUB 184
-#define TXT_CHARM_REMINDER 185
-#define TXT_YN_YES 186
-#define TXT_YN_NO 187
-#define TXT_YN_NOT_ENOUGH 188
-#define MENU_LOGO {2965, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CHARM_ICONS {-1, 3015, 3016, 3017, 3018, -1, 3019, 3020, 3021, -1, -1, -1, -1, -1, 3022, -1, -1, -1, 3023, 3024, 3025, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CHARM_NAMES {-1, 184, 185, 186, 187, -1, 188, 189, 190, -1, -1, -1, -1, -1, 191, -1, -1, -1, 192, 193, 194, -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 195
+#define TXT_CHARM_TUTE_SUB 196
+#define TXT_CHARM_REMINDER 197
+#define TXT_YN_YES 198
+#define TXT_YN_NO 199
+#define TXT_YN_NOT_ENOUGH 200
+#define MENU_LOGO {3026, 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 {2966, 0.0000f, 0.0000f, 1.0023f, 1.0000f}
+#define MENU_POINTER {3027, 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 {2967, 0.0000f, 0.0000f, 1.0000f, 1.0807f}
+#define MENU_PROFILES_FLEUR {3028, 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, {2968, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2969, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2970, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2971, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2972, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
+#define MENU_SLOT_ZONES {{2, {3029, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {3030, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {3031, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {3032, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {3033, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}
#define MENU_SLOT_NZONES 5
#define MENU_SLOT_BG_DY 0.0102f
-#define MENU_SLOT_FLEUR {2973, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_FLEUR {3034, 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 {2974, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_SELECTOR {3035, 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 {2975, 0.0000f, 0.0000f, 1.0000f, 1.0025f}
+#define MENU_SLOT_CURSOR {3036, 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 {2976, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_ORB {3037, 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 {2977, 0.0000f, 0.0000f, 1.0039f, 1.0000f}
+#define MENU_SLOT_GEO {3038, 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 {2978, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_SLOT_HEALTH {3039, 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
@@ -1014,60 +1031,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 {2979, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_TOP {3040, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
#define MENU_PAUSE_TOP_Y 2.3653f
-#define MENU_PAUSE_BOT {2980, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define MENU_PAUSE_BOT {3041, 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 189
-#define TXT_MAIN_QUIT 190
-#define TXT_PROFILE_NEW_GAME 191
-#define TXT_PROFILE_CLEAR_BUTTON 192
-#define TXT_PROFILE_CLEAR_PROMPT 193
-#define TXT_NAV_YES 194
-#define TXT_NAV_NO 195
-#define TXT_NAV_BACK 196
-#define TXT_PAUSE_CONTINUE 197
-#define TXT_PAUSE_MAIN 198
-#define TXT_PROFILE_CORRUPTED 199
-#define TXT_SCREEN_SAVE_PROFILES 200
-#define TXT_ZONES {201, 202, 203, 204, 205}
+#define TXT_MAIN_START 201
+#define TXT_MAIN_QUIT 202
+#define TXT_PROFILE_NEW_GAME 203
+#define TXT_PROFILE_CLEAR_BUTTON 204
+#define TXT_PROFILE_CLEAR_PROMPT 205
+#define TXT_NAV_YES 206
+#define TXT_NAV_NO 207
+#define TXT_NAV_BACK 208
+#define TXT_PAUSE_CONTINUE 209
+#define TXT_PAUSE_MAIN 210
+#define TXT_PROFILE_CORRUPTED 211
+#define TXT_SCREEN_SAVE_PROFILES 212
+#define TXT_ZONES {213, 214, 215, 216, 217}
#define INV_X -4.0500f
#define INV_Y 7.5500f
-#define INV_BORDER {{2981, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2981, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2982, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2983, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2984, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2985, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
+#define INV_BORDER {{3042, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {3042, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {3043, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {3044, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {3045, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {3046, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}
#define INV_NBORDER 6
-#define INV_FRAME {2986, 4.0479f, -7.1963f, 1.0f, 1.0f}
-#define INV_ARROW_L {2987, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
-#define INV_ARROW_R {2987, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_L {2988, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
-#define INV_PANE_ARROW_R {2988, 18.0400f, -0.4300f, 1.0000f, 1.0000f}
+#define INV_FRAME {3047, 4.0479f, -7.1963f, 1.0f, 1.0f}
+#define INV_ARROW_L {3048, -9.8300f, -7.2000f, 1.0000f, 1.0000f}
+#define INV_ARROW_R {3048, 18.0300f, -7.2000f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_L {3049, -9.8600f, -0.4300f, -1.0000f, 1.0000f}
+#define INV_PANE_ARROW_R {3049, 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 {208, 209, 210, 211}
-#define CH_BB {2989, -7.9200f, -8.3700f, 1.0000f, 1.0000f}
+#define TXT_INV_PANES {220, 221, 222, 223}
+#define CH_BB {3050, -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 {2990, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
+#define CH_GLOW {3051, 0.0500f, 0.0600f, 1.0000f, 0.9919f}
#define CH_GLOW_A 0.6970f
-#define CH_ICONS {-1, 2954, 2955, 2956, 2957, -1, 2958, 2959, 2960, -1, -1, -1, -1, -1, 2961, -1, -1, -1, 2962, 2963, 2964, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define CH_NEXT_DOT {2991, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_ICONS {-1, 3015, 3016, 3017, 3018, -1, 3019, 3020, 3021, -1, -1, -1, -1, -1, 3022, -1, -1, -1, 3023, 3024, 3025, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define CH_NEXT_DOT {3052, 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 {2992, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
-#define CH_NOTCH_EMPTY {2993, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_FULL {3053, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_NOTCH_EMPTY {3054, 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 {2994, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
+#define CH_DIVIDER {3055, -0.8400f, -6.9300f, 1.0000f, 0.1591f}
#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}
-#define CH_COST_PIP {2992, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define CH_COST_PIP {3053, 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
@@ -1076,59 +1093,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 {2995, 16.3208f, -13.2878f, 1.0f, 1.0f}
+#define CH_CONFIRM_KEY {3056, 16.3208f, -13.2878f, 1.0f, 1.0f}
#define CH_CONFIRM_KEY_W 0.6412f
-#define CH_CURSOR {2996, 0.0000f, 0.0000f, 1.0000f, 0.9756f}
+#define CH_CURSOR {3057, 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 212
-#define TXT_CHARM_TXT_OVERCHARMED 213
-#define TXT_CHARM_TXT_COST 214
-#define TXT_CTRL_EQUIP 215
-#define TXT_CTRL_UNEQUIP 216
-#define TXT_CHARM_ALERT_NONE 217
-#define TXT_CHARM_ALERT_NONE_BENCH 218
-#define TXT_CHARM_NOTCHES 219
-#define TXT_CHARM_NAMES_INV {-1, 220, 221, 222, 223, -1, 224, 225, 226, -1, -1, -1, -1, -1, 227, -1, -1, -1, 228, 229, 230, -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, 231, 232, 233, 234, -1, 235, 236, 237, -1, -1, -1, -1, -1, 238, -1, -1, -1, 239, 240, 241, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
-#define TXT_KEY_OK 242
-#define INV_FIXED {{2997, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2998, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2999, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {3000, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {3001, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {3002, -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}, {3003, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {3004, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}
+#define TXT_CHARM_TXT_EQUIPPED 224
+#define TXT_CHARM_TXT_OVERCHARMED 225
+#define TXT_CHARM_TXT_COST 226
+#define TXT_CTRL_EQUIP 227
+#define TXT_CTRL_UNEQUIP 228
+#define TXT_CHARM_ALERT_NONE 229
+#define TXT_CHARM_ALERT_NONE_BENCH 230
+#define TXT_CHARM_NOTCHES 231
+#define TXT_CHARM_NAMES_INV {-1, 232, 233, 234, 235, -1, 236, 237, 238, -1, -1, -1, -1, -1, 239, -1, -1, -1, 240, 241, 242, -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, 243, 244, 245, 246, -1, 247, 248, 249, -1, -1, -1, -1, -1, 250, -1, -1, -1, 251, 252, 253, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}
+#define TXT_KEY_OK 254
+#define INV_FIXED {{3058, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {3059, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {3060, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {3061, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {3062, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {3063, -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}, {3064, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {3065, -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 {{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}, {3008, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
-#define INV_VESSEL_PIECES {{3009, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {3010, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {3011, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}
+#define INV_HEART_PIECES {{3066, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3067, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3068, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {3069, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}
+#define INV_VESSEL_PIECES {{3070, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {3071, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {3072, -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 {{3012, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3013, 1.1000f, -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}, {3017, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}
+#define INV_EQ {{3073, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3074, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {3075, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3076, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3077, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {3078, 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 {{3018, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {3019, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {3020, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {3021, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}
+#define INV_TRINKETS {{3079, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {3080, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {3081, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {3082, 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 {3022, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
-#define INV_DIVIDERS {{3023, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {3023, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}
+#define INV_TRINKET_BB {3083, 4.2400f, -10.8700f, 1.0000f, 1.0000f}
+#define INV_DIVIDERS {{3084, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {3084, 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 {{243, 244}, {245, 246}, {247, 248}, {245, 249}, {245, 250}, {251, 252}}
-#define TXT_INV_VESSEL {{243, 244}, {253, 254}, {255, 256}, {253, 257}, {258, 259}}
-#define TXT_INV_FIXED {{260, 261}, {262, 263}, {264, 265}, {266, 267}}
-#define TXT_INV_EQ {{268, 269}, {270, 271}, {272, 273}, {274, 275}, {276, 277}, {278, 279}}
-#define TXT_INV_QUILL {280, 281, 282, 283}
-#define TXT_INV_TRINKETS {{284, 285}, {286, 287}, {288, 289}, {290, 291}}
-#define SHOP_BACKBOARD {3024, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
-#define SHOP_MASK_TOP {3025, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
-#define SHOP_MASK_BOTTOM {3026, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
-#define SHOP_ARROW_U {3027, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
-#define SHOP_ARROW_D {3027, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
-#define SHOP_SELECTOR {3028, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
-#define SHOP_CONFIRM_GEO {3029, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
-#define SHOP_POINTER_L {3030, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
-#define SHOP_POINTER_R {3030, 6.6249f, -2.0798f, -1.0000f, 1.0000f}
+#define TXT_INV_HEART {{255, 256}, {257, 258}, {259, 260}, {257, 261}, {257, 262}, {263, 264}}
+#define TXT_INV_VESSEL {{255, 256}, {265, 266}, {267, 268}, {265, 269}, {270, 271}}
+#define TXT_INV_FIXED {{272, 273}, {274, 275}, {276, 277}, {278, 279}}
+#define TXT_INV_EQ {{280, 281}, {282, 283}, {284, 285}, {286, 287}, {288, 289}, {290, 291}}
+#define TXT_INV_QUILL {292, 293, 294, 295}
+#define TXT_INV_TRINKETS {{296, 297}, {298, 299}, {300, 301}, {302, 303}}
+#define SHOP_BACKBOARD {3085, 4.9000f, -0.3200f, 0.8667f, 1.0000f}
+#define SHOP_MASK_TOP {3086, 5.1230f, 4.8800f, 1.0000f, 0.9013f}
+#define SHOP_MASK_BOTTOM {3087, 5.1537f, -5.6200f, 1.0000f, 0.8820f}
+#define SHOP_ARROW_U {3088, 1.7000f, 1.8900f, 1.0000f, 1.0000f}
+#define SHOP_ARROW_D {3088, 1.7000f, -0.3800f, -1.0000f, 1.0000f}
+#define SHOP_SELECTOR {3089, 1.7300f, 0.7600f, 0.9332f, 1.0000f}
+#define SHOP_CONFIRM_GEO {3090, 4.2800f, 0.3400f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_L {3091, 3.6119f, -2.0798f, 1.0000f, 1.0000f}
+#define SHOP_POINTER_R {3091, 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 293
+#define TXT_KEY_BACK 305
#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}}
@@ -1145,7 +1162,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 {3031, 5.5100f, 2.5800f, 1.0000f, 1.0000f}
+#define SHOP_PEG {3092, 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}
@@ -1156,24 +1173,24 @@
#define SHOP_ROW_TOP 4.9000f
#define SHOP_ROW_BOTTOM -5.2500f
#define SHOP_ARROW_BOB 0.1500f
-#define TXT_SHOP_CTRL_BUY 296
-#define TXT_SHOP_CTRL_EXIT 297
-#define TXT_SHOP_CTRL_CONFIRM 298
-#define TXT_SHOP_CTRL_CANCEL 299
-#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 300
-#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 301
-#define TXT_SHOP_CHARM_TXT_NOTCHCOST 302
-#define TXT_SHOP_YES 303
-#define TXT_SHOP_NO 304
+#define TXT_SHOP_CTRL_BUY 308
+#define TXT_SHOP_CTRL_EXIT 309
+#define TXT_SHOP_CTRL_CONFIRM 310
+#define TXT_SHOP_CTRL_CANCEL 311
+#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 312
+#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 313
+#define TXT_SHOP_CHARM_TXT_NOTCHCOST 314
+#define TXT_SHOP_YES 315
+#define TXT_SHOP_NO 316
#define SHOP_DESC_BOTTOM -5.0500f
-#define SHOP_ITEMS {{3033, 0.5714f, 305, 306, 150, 1, 125, -1, 0, 0}, {3033, 0.5714f, 305, 307, 500, 1, 126, 125, 0, 0}, {3034, 0.5714f, 308, 309, 550, 3, 127, -1, 0, 0}, {3035, 0.5714f, 310, 311, 950, 10, 128, -1, 0, 0}, {3036, 0.5714f, 312, 313, 300, 2, 37, -1, 0, 1}, {3037, 0.5714f, 314, 315, 200, 2, 40, -1, 0, 4}, {3038, 0.5714f, 316, 317, 1800, 0, 119, -1, 0, 0}, {3039, 0.5714f, 318, 319, 60, 11, 129, -1, 0, 0}, {3040, 0.5714f, 320, 321, 220, 2, 38, -1, 0, 2}, {3041, 0.5714f, 322, 323, 120, 0, 2, -1, 0, 0}, {3042, 0.5714f, 324, 325, 40, 9, 130, 10, 0, 0}, {3042, 0.5714f, 326, 327, 80, 9, 131, 28, 0, 0}, {3043, 0.5714f, 328, 329, 100, 16, 133, -1, 0, 0}, {3044, 0.5714f, 330, 331, 100, 16, 134, -1, 0, 0}, {3045, 0.5714f, 332, 333, 100, 16, 135, -1, 0, 0}, {3046, 0.5714f, 334, 335, 100, 16, 137, 147, 0, 0}, {3047, 0.5714f, 336, 337, 100, 16, 136, -1, 0, 0}, {3048, 0.5714f, 338, 339, 100, 17, 139, -1, 0, 0}, {3049, 0.5714f, 340, 341, 100, 17, 140, -1, 0, 0}, {3050, 0.5714f, 342, 343, 100, 17, 141, 14, 0, 0}, {3051, 0.5714f, 344, 345, 210, 17, 142, 14, 0, 0}, {3052, 0.5714f, 346, 347, 250, 2, 44, -1, 0, 8}, {3053, 0.5714f, 348, 349, 300, 2, 54, -1, 0, 18}, {3054, 0.5714f, 350, 351, 120, 2, 50, -1, 0, 14}, {3055, 0.5714f, 352, 353, 220, 2, 55, -1, 0, 19}, {3056, 0.5714f, 354, 355, 800, 2, 43, -1, 0, 7}, {3057, 0.5714f, 356, 357, 120, 8, 143, -1, 5, 0}, {3057, 0.5714f, 356, 357, 500, 8, 144, -1, 10, 0}, {3057, 0.5714f, 356, 357, 900, 8, 145, -1, 18, 0}, {3057, 0.5714f, 356, 358, 1400, 8, 146, -1, 25, 0}}
+#define SHOP_ITEMS {{3094, 0.5714f, 317, 318, 150, 1, 125, -1, 0, 0}, {3094, 0.5714f, 317, 319, 500, 1, 126, 125, 0, 0}, {3095, 0.5714f, 320, 321, 550, 3, 127, -1, 0, 0}, {3096, 0.5714f, 322, 323, 950, 10, 128, -1, 0, 0}, {3097, 0.5714f, 324, 325, 300, 2, 37, -1, 0, 1}, {3098, 0.5714f, 326, 327, 200, 2, 40, -1, 0, 4}, {3099, 0.5714f, 328, 329, 1800, 0, 119, -1, 0, 0}, {3100, 0.5714f, 330, 331, 60, 11, 129, -1, 0, 0}, {3101, 0.5714f, 332, 333, 220, 2, 38, -1, 0, 2}, {3102, 0.5714f, 334, 335, 120, 0, 2, -1, 0, 0}, {3103, 0.5714f, 336, 337, 40, 9, 130, 10, 0, 0}, {3103, 0.5714f, 338, 339, 80, 9, 131, 28, 0, 0}, {3104, 0.5714f, 340, 341, 100, 16, 133, -1, 0, 0}, {3105, 0.5714f, 342, 343, 100, 16, 134, -1, 0, 0}, {3106, 0.5714f, 344, 345, 100, 16, 135, -1, 0, 0}, {3107, 0.5714f, 346, 347, 100, 16, 137, 147, 0, 0}, {3108, 0.5714f, 348, 349, 100, 16, 136, -1, 0, 0}, {3109, 0.5714f, 350, 351, 100, 17, 139, -1, 0, 0}, {3110, 0.5714f, 352, 353, 100, 17, 140, -1, 0, 0}, {3111, 0.5714f, 354, 355, 100, 17, 141, 14, 0, 0}, {3112, 0.5714f, 356, 357, 210, 17, 142, 14, 0, 0}, {3113, 0.5714f, 358, 359, 250, 2, 44, -1, 0, 8}, {3114, 0.5714f, 360, 361, 300, 2, 54, -1, 0, 18}, {3115, 0.5714f, 362, 363, 120, 2, 50, -1, 0, 14}, {3116, 0.5714f, 364, 365, 220, 2, 55, -1, 0, 19}, {3117, 0.5714f, 366, 367, 800, 2, 43, -1, 0, 7}, {3118, 0.5714f, 368, 369, 120, 8, 143, -1, 5, 0}, {3118, 0.5714f, 368, 369, 500, 8, 144, -1, 10, 0}, {3118, 0.5714f, 368, 369, 900, 8, 145, -1, 18, 0}, {3118, 0.5714f, 368, 370, 1400, 8, 146, -1, 25, 0}}
#define SHOP_FIRST {0, 8, 21, 30}
-#define SHOP_ROW_GEO {3032, 1.4551f, 0.0000f, 1.0000f, 1.0000f}
+#define SHOP_ROW_GEO {3093, 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 {360, 361, 362}
+#define SHOP_NOSTOCK {372, 373, 374}
#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}
@@ -1183,36 +1200,57 @@
#define COLLECT_MOVER_TO {-7.7000f, 6.0400f}
#define STAG_AT {0.3000f, 0.3000f}
#define STAG_K 1.2646f
-#define STAG_BACKING {3058, -0.4427f, 0.0000f, 1.0000f, 0.6408f}
+#define STAG_BACKING {3119, -0.4427f, 0.0000f, 1.0000f, 0.6408f}
#define STAG_BACKING_A 0.9020f
-#define STAG_PIECES {{3059, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {3060, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {3061, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3062, 0.4147f, 1.5909f, 1.0000f, 1.0000f}}
+#define STAG_PIECES {{3120, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {3121, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {3122, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3123, 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 {3063, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
-#define STAG_MAP_SHADOW {3064, 0.0110f, -0.0100f, 1.0000f, 0.9227f}
+#define STAG_MAP_KNIGHT {3124, 0.0000f, 0.0000f, 1.0000f, 1.0000f}
+#define STAG_MAP_SHADOW {3125, 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 {3065, 2.8680f, 0.6180f, -1.0000f, 1.0000f}
-#define STAG_POINTER_L {3065, -2.8680f, 0.6180f, 1.0000f, 1.0000f}
+#define STAG_POINTER_R {3126, 2.8680f, 0.6180f, -1.0000f, 1.0000f}
+#define STAG_POINTER_L {3126, -2.8680f, 0.6180f, 1.0000f, 1.0000f}
#define STAG_ROW {-7.5992f, 3.9576f}
-#define STAG_LIST_KNIGHT {3063, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
-#define STAG_DIVIDER {3066, -7.6003f, 5.2734f, -1.0000f, -0.8696f}
+#define STAG_LIST_KNIGHT {3124, -10.5102f, 4.6056f, 1.0000f, 1.0000f}
+#define STAG_DIVIDER {3127, -7.6003f, 5.2734f, -1.0000f, -0.8696f}
#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}
-#define TXT_STAG_STATIONS 363
-#define TXT_STAG_NAMES {364, 324, 326}
+#define TXT_STAG_STATIONS 375
+#define TXT_STAG_NAMES {376, 336, 338}
#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 365
+#define TXT_STAG_CTRL_TRAVEL 377
#define STAG_T_ACT_CANCEL {11.1713f, -5.3525f, 15.3500f}
#define STAG_KEY_CANCEL {11.7464f, -5.6213f}
-#define TXT_STAG_CTRL_CANCEL 299
+#define TXT_STAG_CTRL_CANCEL 311
#define STAG_SCENES_STR {137, 136, 138}
#define STAG_SCENES_ROOM {4, 19, 36}
+#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 381, 0x14u}, {2, 23, 130, -0.0400f, -7.8800f, 384, 0x400020u}}
+#define MAP_ROOMS {{0, 1, 3128, 3129, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 0, 3135, 3136, -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, 255, 3138, 3139, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 19, 3140, -1, 1.4650f, 4.4640f, 0.6500f, 0.3100f, 0xB5DDFB, 0}, {1, 255, 3141, 3142, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 15, 3143, 3144, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 9, 3145, -1, -3.0980f, 6.4880f, 1.1110f, 0.4800f, 0xB5DDFB, 0}, {1, 10, 3147, 3148, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 25, 3149, -1, -0.6440f, 4.4430f, 0.7000f, 0.3700f, 0xB5DDFB, 0}, {1, 14, 3151, 3152, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 20, 3153, 3154, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 17, 3155, 3156, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 16, 3157, 3158, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3159, 3160, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3161, 3162, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 26, 3163, -1, -3.7180f, 5.7650f, 2.3517f, 0.4300f, 0xB5DDFB, 0}, {1, 13, 3165, 3166, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 24, 3167, 3168, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 8, 3169, 3170, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 11, 3171, -1, -1.5030f, 5.1050f, 0.8500f, 0.8900f, 0xB5DDFB, 0}, {1, 21, 3172, -1, 3.7290f, 3.4460f, 2.4100f, 0.6600f, 0xB5DDFB, 0}, {1, 18, 3174, 3175, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 6, 3176, 3177, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 5, 3178, 3179, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}}
+#define MAP_PINS {{0, 0, 3130, -2.0390f, 7.7500f, 133, -1}, {0, 0, 3131, -1.6430f, 7.7500f, 137, -1}, {0, 0, 3132, -2.4700f, 7.7500f, 135, 122}, {0, 0, 3133, -1.2540f, 7.7600f, 135, 123}, {1, 1, 3137, -6.2100f, 7.6800f, 134, -1}, {2, 1, 3137, -1.3150f, 5.0920f, 134, -1}, {4, 0, 3131, 1.2400f, 4.4520f, 137, -1}, {4, 0, 3130, 1.6210f, 4.4490f, 133, -1}, {7, 0, 3146, -3.0697f, 6.4597f, 135, -1}, {9, 0, 3130, -0.3430f, 4.4060f, 133, -1}, {9, 0, 3150, -0.7200f, 4.3930f, 136, -1}, {20, 0, 3130, -1.6940f, 5.0880f, 133, -1}, {21, 0, 3173, 4.5530f, 3.3700f, 135, 124}, {21, 0, 3130, 4.9480f, 3.3820f, 133, -1}}
+#define MAP_NEXT {{0, 3134, -1.0730f, 6.4850f, 180.0000f, 380, -1.0730f, 6.1870f, 1, -1}, {16, 3164, -5.2607f, 5.8454f, 90.0000f, 382, -5.5969f, 6.0434f, 2, 16}, {24, 3134, -1.0730f, 7.2500f, 0.0000f, 379, -1.0930f, 7.9120f, 1, -1}}
+#define MAP_NAMES {{0, -1, 378, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 379, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 380, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {1, 20, 383, 3.4800f, 5.6971f, 0xB5DCFB, 1, 0}}
+#define MAP_QUICK_K 1.5500f
+#define MAP_WORLD_K 1.4500f
+#define MAP_SHADE {{3180, 0.0055f, -0.0110f, 178}, {3181, 0.0000f, 0.0000f, 255}}
+#define MAP_MARKERS {3182, 3183, 3184, 3185}
+#define MAP_COMPASS_K 0.7000f
+#define MAP_BG_A 0.4438f
+#define MAP_TITLE {0.0000f, 7.5363f}
+#define MAP_TITLE_BACK {3186, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}
+#define MAP_NO_MAP {3187, 0.0000f, 0.9400f}
+#define MAP_NO_MAP_MSG {385, -0.0600f, -1.2932f}
+#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 386, 3188, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}
+#define MAP_MSG_K 0.7000f
+#define FIRSTMAP_BG_A 0.6410f
+#define FIRSTMAP_TEXTS {{387, 0.0000f, 5.0305f}, {182, 0.0000f, -0.8796f}, {388, 0.0000f, -3.2895f}, {389, 0.0000f, -4.6996f}}
+#define FIRSTMAP_PIECES {{3189, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3190, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3191, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}
+#define FIRSTMAP_KEY {390, 0.0900f, -2.3200f}
#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 {257, 258, 259, 270, 271, 272}
+#define SEMI_PERSIST {258, 259, 260, 271, 272, 273}
diff --git a/games/hollowknight/src/game.c b/games/hollowknight/src/game.c
index 99f3f0b2..af51c9f5 100644
--- a/games/hollowknight/src/game.c
+++ b/games/hollowknight/src/game.c
@@ -37,6 +37,7 @@ void game_new(void) {
stag_reset();
death_reset();
white_blanker_reset();
+ map_reset();
}
/* a room just loaded: no triggers in yet, gates whose objects a PlayerData bool turns off (a box flagged 2 after the
@@ -420,6 +421,7 @@ static void step(uint32_t keys) {
hero_late_update();
cam_tick();
hud_tick();
+ map_hud_tick();
}
void game_tick(uint32_t keys) {
@@ -440,6 +442,7 @@ bool game_changing_room(void) { return g_game.scene_phase != SP_NONE; }
void game_draw_layers(void) {
collect_draw();
hud_draw();
+ map_draw();
msg_draw();
titles_draw();
dialogue_draw();
diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.h
index 9446e968..51df40ea 100644
--- a/games/hollowknight/src/game.h
+++ b/games/hollowknight/src/game.h
@@ -39,7 +39,7 @@ enum {
PDF_SALUBRA_NOTCH4, PDF_MET_STAG, PDF_CORNIFER_AT_HOME, PDF_ISELDA_CONVO1, PDF_ISELDA_CORNIFER_HOME_CONVO,
PDF_SALUBRA_CONVO_COMBO, PDF_SALUBRA_CONVO_OVERCHARM, PDF_SALUBRA_CONVO_TRUTH, PDF_SLY_CONVO_MAPPER,
PDF_OPENED_CROSSROADS, PDF_OPENED_GREENPATH, PDF_TRAVELLING, PDF_STAG_REMEMBER1, PDF_STAG_CONVO_TISO,
- PDF_QUIRREL_LEFT_EGG_TEMPLE, PDF_COUNT
+ PDF_QUIRREL_LEFT_EGG_TEMPLE, PDF_MET_CORNIFER, PDF_CORN_CROSSROADS_ENCOUNTERED, PDF_CORNIFER_INTRODUCED, PDF_COUNT
};
typedef struct {
/* (saved: the layout only ever grows into reserved) */
@@ -73,13 +73,19 @@ typedef struct {
uint8_t current_inv_pane; /* (currentInvPane) */
uint8_t stag_position1; /* (stagPosition + 1: 0 none yet, 1 Dirtmouth, 2 Crossroads, 3 Greenpath) */
uint8_t stations_opened; /* (stationsOpened) */
- uint8_t reserved[30];
+ /* (scenesVisited, scenesMapped (the quill's), scenesEncounteredCocoon (a lifeblood cocoon broken there): by room) */
+ uint8_t rooms_visited[5], rooms_mapped[5], rooms_cocoon[5];
+ uint8_t reserved[15];
+ /* (save version 2 on) the markers placed on the map (placedMarkers_b, _r, _y, _w: their places, 1/100 map units) */
+ uint8_t markers_placed[4];
+ int16_t markers[4][6][2];
/* (saved apart, by the objects' names: their states) */
uint8_t persist[MAX_PERSIST / 8];
/* (not saved) */
bool disable_pause;
} PlayerData;
#define PD_SAVED offsetof(PlayerData, persist)
+#define PD_SAVED_V1 offsetof(PlayerData, markers_placed) /* (a version 1 save's: no markers) */
extern PlayerData g_pd;
static inline bool pd_flag(int f) { return g_pd.flags[f >> 3] >> (f & 7) & 1; }
/* (equippedCharm_N) */
@@ -304,6 +310,7 @@ void hero_stop_anim_control(void); /* StopAnimationControl, StartAnimationCo
void hero_start_anim_control(void);
bool hero_can_focus(void);
bool hero_can_cast(void);
+bool hero_can_quick_map(void); /* CanQuickMap */
void hero_face(bool right); /* FaceRight, FaceLeft */
void hero_gravity(bool on); /* AffectedByGravity */
void hero_max_health(void); /* MaxHealth */
@@ -317,6 +324,19 @@ void death_tick(void);
void death_draw(void);
void shade_spawn_check(void); /* (SceneManager: the shade where the Knight died, if this is that room) */
+/* the map (map.c): the Knight's Map Control, the quick map, the rooms visited and mapped */
+void map_reset(void);
+void map_tick(void); /* (the Knight's Map Control: with his update) */
+void map_cancel(void); /* (HERO DAMAGED, LEAVING SCENE, FSM CANCEL) */
+void map_hud_tick(void);
+void map_draw(void);
+bool map_shown(void);
+void map_room_entered(void); /* (scenesVisited) */
+void map_cocoon_broken(void); /* (AddToCocoonList) */
+bool map_update(void); /* UpdateGameMap: the quill's -> any room newly mapped */
+void map_quick(bool open); /* (a bench's: OPEN QUICK MAP, CLOSE QUICK MAP) */
+void map_msg_show(void); /* (Map Update Msg) */
+
/* benches (npc.c) */
void benches_enter(void);
void benches_tick(void);
@@ -368,6 +388,7 @@ void white_blanker_time(float t);
void white_blanker_reset(void); /* (and the Prompt Blanker, the focus tutorial) */
void prompt_blanker(bool up); /* the HUD's Prompt Blanker: UP, DOWN */
void focus_prompt_fade(bool up); /* the focus tutorial (Focus_prompt_temp): its ColorFaders' Fade */
+void first_map_prompt(bool up); /* the first map's lesson (First Map): FIRST MAP UP, DOWN */
/* the notices (Relic Get Msg, Charm Get Msg) and the charm tutorial (Charm Tutorial Msg) */
void notice_icon(int k); /* (the next notice's icon: the scripts' NOTICE_ICONS) */
void notice_show(int text); /* a relic's notice: its icon, its name */
@@ -440,6 +461,7 @@ void inv_reset(void);
uint32_t inv_tick(uint32_t keys); /* -> the keys the game has (none while it is open) */
void inv_damage(void); /* (HERO DAMAGED: it closes) */
bool inv_open(void);
+void inv_open_map(void); /* (OPEN INVENTORY MAP: the map tapped twice) */
float text_box(int text, int style, float x, float y, float w, int align, float a);
int charm_cost(int id); /* (charmCost_N) */
bool charm_equipped(int id);
diff --git a/games/hollowknight/src/hero.c b/games/hollowknight/src/hero.c
index 794805e2..a039357b 100644
--- a/games/hollowknight/src/hero.c
+++ b/games/hollowknight/src/hero.c
@@ -805,6 +805,7 @@ void hero_update(void) {
respawn_tick();
entering_tick();
spell_update();
+ map_tick();
if (h->anim_control) animation();
h->anim.events = 0;
anim_update(&h->anim, DT);
@@ -847,6 +848,7 @@ void hero_die(void) {
h->hard_landing_timer = 0;
h->hidden = true;
spell_cancel();
+ map_cancel();
slash_cancel();
death_start(h->body.x, h->body.y, h->cs.facing_right);
}
@@ -967,6 +969,7 @@ void fx_dash_burst(float x, float y, bool facing_right, bool on_ground) { (void)
void hero_leave_scene(int gate) {
Hero *h = &g_hero;
spell_cancel(); /* (LEAVING SCENE) */
+ map_cancel();
dialogue_cancel();
h->accepting_input = false; /* (IgnoreInputWithoutReset) */
h->hard_landing_timer = 0;
@@ -1275,6 +1278,7 @@ void hero_take_damage(int side, int damage, int hazard) {
if (h->parry_t > 0 && hazard == HAZ_NORMAL) return;
if (can_take_damage()) {
spell_cancel(); /* (HERO DAMAGED) */
+ map_cancel();
vm_broadcast(VMEV_HERO_DAMAGED);
inv_damage();
if (h->damage_mode == DAMAGE_HAZARD_ONLY && hazard == HAZ_NORMAL) return;
@@ -1512,6 +1516,13 @@ bool hero_can_focus(void) {
!h->cs.hazard_respawning && h->accepting_input;
}
+bool hero_can_quick_map(void) {
+ const Hero *h = &g_hero;
+ return !g_game.paused && !h->control_relinquished && h->state != HS_NO_INPUT && !h->cs.dashing &&
+ !(h->cs.attacking && h->attack_time < ATTACK_RECOVERY_TIME) && !h->cs.recoiling && !h->cs.transitioning &&
+ !h->cs.hazard_death && !h->cs.hazard_respawning && !h->cs.recoil_frozen && h->cs.on_ground && h->accepting_input;
+}
+
bool hero_can_cast(void) {
const Hero *h = &g_hero;
return !g_game.paused && h->prevent_cast <= 0 && !h->cs.dashing && h->state != HS_NO_INPUT && !(h->cs.attacking && h->attack_time < ATTACK_RECOVERY_TIME) &&
diff --git a/games/hollowknight/src/inv.c b/games/hollowknight/src/inv.c
index c8aa6668..4785a8fe 100644
--- a/games/hollowknight/src/inv.c
+++ b/games/hollowknight/src/inv.c
@@ -293,6 +293,12 @@ static void close_now(void) {
if (!pd_flag(PDF_AT_BENCH)) hero_regain_control();
}
+void inv_open_map(void) {
+ if (iv.st != IV_CLOSED || !can_open()) return;
+ g_pd.current_inv_pane = P_MAP;
+ open();
+}
+
void inv_damage(void) {
if (iv.st == IV_OPEN) iv.st = IV_CLOSING, iv.t = FADE - 0.05f; /* (Damage Close: down fast) */
}
diff --git a/games/hollowknight/src/map.c b/games/hollowknight/src/map.c
new file mode 100644
index 00000000..440aca96
--- /dev/null
+++ b/games/hollowknight/src/map.c
@@ -0,0 +1,492 @@
+/* The map: the Knight's Map Control FSM (the map key held on the ground: the map out, walking with it; tapped twice:
+ * the inventory's), the HUD's Quick Map (its backdrop, the area's name, or no map) and Game_Map, the area's part shown:
+ * its rooms as Cornifer drew them, rough until the quill maps them, their pins, the arrows to the areas next to them,
+ * the compass (Wayward Compass: where the Knight is), the shade's mark. The rooms visited, mapped, where a cocoon was
+ * broken: PlayerData's (scenesVisited, scenesMapped, scenesEncounteredCocoon). */
+#include <math.h>
+#include "game.h"
+
+#define DT 0.02f
+#define BUTTON_DOWN_TIME 0.1f /* (Button Down Time) */
+#define DOUBLE_TIME 0.25f /* (Check Double's wait; Close Doub Check's open time) */
+#define WALK_SPEED 4.0f
+#define HUD_PX (FOCAL / (-1.342f - CAM_Z))
+
+typedef struct { uint8_t first, n; int16_t have; float qx, qy; int16_t title; uint32_t zones; } MapArea;
+typedef struct { uint8_t area, room; int16_t sprite, full; float x, y, w, h; uint32_t rgb; uint8_t rough; } MapRoom;
+typedef struct { uint8_t room, kind; int16_t sprite; float x, y; int16_t f1, f2; } MapPin;
+typedef struct { uint8_t room; int16_t sprite; float x, y, ang; int16_t text; float tx, top; uint8_t align; int16_t visited; } MapNext;
+typedef struct { int8_t area, room; int16_t text; float x, top; uint32_t rgb; uint8_t align, world_only; } MapName;
+static const MapArea areas[] = MAP_AREAS;
+static const MapRoom rooms[] = MAP_ROOMS;
+static const MapPin pins[] = MAP_PINS;
+static const MapNext nexts[] = MAP_NEXT;
+static const MapName names[] = MAP_NAMES;
+#define NAREAS (int)(sizeof areas / sizeof areas[0])
+#define NMROOMS (int)(sizeof rooms / sizeof rooms[0])
+
+enum {
+ MC_INACTIVE, MC_BUTTON_DOWN, MC_CHECK_DOUBLE, MC_OPEN, MC_IDLE, MC_TURN, MC_WALK, MC_CLOSE, MC_CLOSE_DOUBLE_FAIL
+};
+static struct {
+ uint8_t st;
+ float t, open_time;
+ bool in_control, walk_right, walking;
+ /* the quick map: shown (and its area), the backdrop's, the name's, the no map message's fades */
+ bool shown;
+ int8_t area; /* (-1: no map of it) */
+ float bg_a, name_a, nomap_a, t_open;
+ Anim compass;
+} mc;
+
+static bool held(void) { return g_hero.keys & K_MAP; }
+static bool pressed(void) { return (g_hero.keys & K_MAP) && !(g_hero.prev_keys & K_MAP); }
+
+/* ---------------------------------------------------------------- PlayerData's lists */
+static bool bit(const uint8_t *b, int i) { return i >= 0 && i < 40 && (b[i >> 3] >> (i & 7) & 1); }
+static void set_bit(uint8_t *b, int i) {
+ if (i >= 0 && i < 40) b[i >> 3] |= (uint8_t)(1 << (i & 7));
+}
+
+void map_room_entered(void) { set_bit(g_pd.rooms_visited, g_room.id); } /* (SceneManager: scenesVisited) */
+void map_cocoon_broken(void) { set_bit(g_pd.rooms_cocoon, g_room.id); } /* (AddToCocoonList) */
+
+static bool have_area(int a) { return areas[a].have < 0 || pd_flag(areas[a].have); }
+
+/* UpdateGameMap: with the quill, the rooms visited whose area's map the Knight has, mapped -> any new */
+bool map_update(void) {
+ if (!pd_flag(PDF_HAS_QUILL)) return false;
+ bool any = false;
+ for (int i = 0; i < NMROOMS; i++) {
+ int r = rooms[i].room;
+ if (r == 255 || !bit(g_pd.rooms_visited, r) || bit(g_pd.rooms_mapped, r) || !have_area(rooms[i].area)) continue;
+ set_bit(g_pd.rooms_mapped, r);
+ any = true;
+ }
+ return any;
+}
+
+/* ---------------------------------------------------------------- Map Control */
+static struct {
+ bool on;
+ float t, a, quill_a;
+ Anim quill;
+} mm; /* (the map's update message: below) */
+static void quick_open(void);
+static void quick_close(void);
+
+void map_reset(void) {
+ memset(&mc, 0, sizeof mc);
+ mc.compass.sprite = -1;
+ memset(&mm, 0, sizeof mm);
+ mm.quill.sprite = -1;
+}
+
+static bool can_quick_map(void) { return hero_can_quick_map(); }
+
+static void regain(void) {
+ /* Regain Control (not at a bench) */
+ g_pd.disable_pause = false;
+ if (!pd_flag(PDF_AT_BENCH)) {
+ hero_regain_control();
+ hero_start_anim_control();
+ }
+ mc.in_control = false;
+ mc.st = MC_INACTIVE, mc.open_time = 0;
+}
+
+static void open_map(void) {
+ /* Open Map: the Knight's control taken, Map Open */
+ mc.open_time = 0;
+ g_pd.disable_pause = true;
+ quick_open();
+ mc.in_control = true;
+ hero_relinquish_control();
+ hero_stop_anim_control();
+ anim_play_from_frame(&g_hero.anim, CLIP_KNIGHT_MAP_OPEN, 0);
+ mc.st = MC_OPEN;
+}
+
+static void close_map(void) {
+ /* Close Map: Map Away */
+ quick_close();
+ g_hero.body.vx = 0;
+ mc.walking = false;
+ anim_play_from_frame(&g_hero.anim, CLIP_KNIGHT_MAP_AWAY, 0);
+ mc.st = MC_CLOSE;
+}
+
+static void idle(void) {
+ g_hero.body.vx = 0;
+ mc.walking = false;
+ anim_play(&g_hero.anim, CLIP_KNIGHT_MAP_IDLE);
+ mc.st = MC_IDLE;
+}
+
+static void open_inventory_map(void) {
+ /* (Double!: OPEN INVENTORY MAP) */
+ inv_open_map();
+}
+
+/* (HERO DAMAGED, LEAVING SCENE, FSM CANCEL: Cancel All) */
+void map_cancel(void) {
+ if (mc.st == MC_INACTIVE) return;
+ quick_close();
+ bool in_control = mc.in_control;
+ mc.st = MC_INACTIVE, mc.open_time = 0, mc.walking = false, mc.in_control = false;
+ if (in_control) {
+ g_pd.disable_pause = false;
+ hero_start_anim_control();
+ }
+}
+
+void map_tick(void) {
+ bool down = pressed(), on = held();
+ bool ended = g_hero.anim.events & ANIM_DONE;
+ /* (Open time: counted idle and with the map out; from naught as it is opened) */
+ if (mc.st == MC_INACTIVE || (mc.st >= MC_OPEN && mc.st <= MC_WALK)) mc.open_time = fminf(3, mc.open_time + DT);
+ /* (leaving the ground: Quick Cancel) */
+ if (mc.st >= MC_OPEN && mc.st <= MC_WALK && !g_hero.cs.on_ground) {
+ quick_close();
+ regain();
+ return;
+ }
+ switch (mc.st) {
+ case MC_INACTIVE:
+ if (!down) break;
+ /* Button Down Check */
+ if (g_pd.disable_pause || !pd_flag(PDF_HAS_MAP) || pd_flag(PDF_AT_BENCH) || !can_quick_map()) break;
+ mc.st = MC_BUTTON_DOWN, mc.t = 0;
+ break;
+ case MC_BUTTON_DOWN:
+ if (down) {
+ open_inventory_map();
+ mc.st = MC_INACTIVE, mc.open_time = 0;
+ break;
+ }
+ if ((mc.t += DT) < BUTTON_DOWN_TIME) break;
+ /* Button Still Down?, Can QuickMap?, Has Map? */
+ if (on && !g_pd.disable_pause && can_quick_map() && pd_flag(PDF_HAS_MAP)) open_map();
+ else if (on) mc.st = MC_INACTIVE, mc.open_time = 0;
+ else mc.st = MC_CHECK_DOUBLE, mc.t = 0;
+ break;
+ case MC_CHECK_DOUBLE:
+ if (down && !g_pd.disable_pause && can_quick_map()) {
+ open_inventory_map();
+ mc.st = MC_INACTIVE, mc.open_time = 0;
+ } else if ((mc.t += DT) >= DOUBLE_TIME)
+ mc.st = MC_INACTIVE, mc.open_time = 0;
+ break;
+ case MC_OPEN:
+ if (!on) close_map();
+ else if (ended || !g_hero.anim.playing) idle();
+ break;
+ case MC_IDLE:
+ if (!on) {
+ close_map();
+ break;
+ }
+ if (g_hero.keys & (K_LEFT | K_RIGHT)) {
+ /* Turn R?, Turn L?: turned already, walking; else Map Turn first */
+ mc.walk_right = (g_hero.keys & K_RIGHT) != 0;
+ g_hero.body.vx = 0;
+ if (g_hero.cs.facing_right == mc.walk_right) {
+ mc.st = MC_WALK;
+ anim_play(&g_hero.anim, CLIP_KNIGHT_MAP_WALK);
+ } else {
+ anim_play_from_frame(&g_hero.anim, CLIP_KNIGHT_MAP_TURN, 0);
+ mc.st = MC_TURN;
+ }
+ }
+ break;
+ case MC_TURN:
+ if (!on) close_map();
+ else if (ended || !g_hero.anim.playing) {
+ mc.st = MC_WALK;
+ anim_play(&g_hero.anim, CLIP_KNIGHT_MAP_WALK);
+ }
+ break;
+ case MC_WALK:
+ if (!on) {
+ close_map();
+ break;
+ }
+ if (!(g_hero.keys & (mc.walk_right ? K_RIGHT : K_LEFT))) {
+ idle();
+ break;
+ }
+ /* (MAPWALK START; FaceRight, FaceLeft; its speed each frame) */
+ mc.walking = true;
+ hero_face(mc.walk_right);
+ g_hero.body.vx = mc.walk_right ? WALK_SPEED : -WALK_SPEED;
+ break;
+ case MC_CLOSE:
+ if (down) {
+ /* Close Doub Check: soon after it was opened, the inventory's map; else the Map Away goes on */
+ if (mc.open_time <= DOUBLE_TIME) {
+ anim_play(&g_hero.anim, CLIP_KNIGHT_IDLE);
+ open_inventory_map();
+ mc.in_control = false;
+ g_pd.disable_pause = false;
+ hero_regain_control();
+ hero_start_anim_control();
+ mc.st = MC_INACTIVE, mc.open_time = 0;
+ break;
+ }
+ mc.st = MC_CLOSE_DOUBLE_FAIL;
+ }
+ if (ended || !g_hero.anim.playing) regain();
+ break;
+ case MC_CLOSE_DOUBLE_FAIL:
+ if (ended || !g_hero.anim.playing) regain();
+ break;
+ }
+}
+
+/* ---------------------------------------------------------------- the quick map */
+static void quick_open(void) {
+ /* Open: the backdrop up; 0.2 s, then the area's map and name (no map: its message) */
+ mc.shown = true, mc.t_open = 0, mc.area = -2;
+ anim_play(&mc.compass, CLIP_MAPUI_IDLE);
+}
+
+static void quick_close(void) {
+ /* Close: the map gone at once; the name, the backdrop, the message fade */
+ mc.shown = false;
+}
+
+static int area_of_zone(void) {
+ for (int a = 0; a < NAREAS; a++)
+ if (areas[a].zones >> g_pd.map_zone & 1) return a;
+ return -1;
+}
+
+static void map_msg_tick(void);
+
+void map_hud_tick(void) {
+ map_msg_tick();
+ /* (FadeGroups: the backdrop in 0.4 s, out 0.25; the name in 0.4, out 0.3; the message in 0.3, out 0.25) */
+ if (mc.shown) {
+ mc.t_open += DT;
+ mc.bg_a = fminf(1, mc.bg_a + DT / 0.4f);
+ if (mc.t_open >= 0.2f && mc.area == -2) {
+ int a = area_of_zone();
+ mc.area = (int8_t)(a >= 0 && have_area(a) ? a : -1);
+ }
+ if (mc.area >= 0) mc.name_a = fminf(1, mc.name_a + DT / 0.4f);
+ else if (mc.area == -1) mc.nomap_a = fminf(1, mc.nomap_a + DT / 0.3f);
+ mc.compass.events = 0;
+ anim_play(&mc.compass, mc.walking ? CLIP_MAPUI_WALK : CLIP_MAPUI_IDLE);
+ anim_update(&mc.compass, DT);
+ } else {
+ mc.bg_a = fmaxf(0, mc.bg_a - DT / 0.25f);
+ mc.name_a = fmaxf(0, mc.name_a - DT / 0.3f);
+ mc.nomap_a = fmaxf(0, mc.nomap_a - DT / 0.25f);
+ }
+}
+
+/* the map's colors: a tint each (the menus', the item message's: never up with it), afresh each frame */
+static uint32_t tint_used[4];
+static int tint_n;
+static uint8_t map_tint(uint32_t rgb, uint8_t a) {
+ static const uint8_t slots[] = {29, 30, 31, 25};
+ uint32_t *used = tint_used;
+ int n = tint_n;
+ uint32_t key = rgb << 8 | a;
+ for (int i = 0; i < n; i++)
+ if (used[i] == key) return gfx_dyn_tint(slots[i], (uint8_t)(rgb >> 16), (uint8_t)(rgb >> 8), (uint8_t)rgb, a);
+ int i = n < 4 ? tint_n++ : 3;
+ used[i] = key;
+ return gfx_dyn_tint(slots[i], (uint8_t)(rgb >> 16), (uint8_t)(rgb >> 8), (uint8_t)rgb, a);
+}
+
+static void hud_sprite(int sprite, float x, float y, float k, float deg, uint8_t tint) {
+ if (sprite < 0) return;
+ Inst in;
+ if (deg != 0) sprite_inst_rot(sprite, x, y, 0, k, k, deg, tint, &in);
+ else sprite_inst(sprite, x, y, 0, k, k, tint, &in);
+ gfx_hud(&in, 0);
+}
+
+/* a text: its lines centred on x, from its left or to its right (align 0 left, 1 centred, 2 right), its top at top */
+static void hud_text(int text, int style, float x, float top, int align, uint32_t rgb, float a) {
+ uint8_t al = (uint8_t)(a * 255 + 0.5f);
+ if (text < 0 || !al) return;
+ const uint8_t *s = text_get(text), *st = font_style(style);
+ float py = VIEW_H / 2 - top * HUD_PX + font_asc(st);
+ for (int i = 0;;) {
+ int e = i;
+ while (s[e] && s[e] != TEXT_BR) e++;
+ float w = text_width(style, s + i, e - i);
+ gfx_text(style, VIEW_W / 2 + x * HUD_PX - (align == 1 ? w / 2 : align == 2 ? w : 0), py, s + i, e - i,
+ (uint32_t)al << 24 | rgb, 0);
+ if (!s[e]) break;
+ i = e + 1, py += font_line(st);
+ }
+}
+
+/* a room of the map shown: rough with its area's map; else once mapped */
+static bool room_shown(int i) {
+ const MapRoom *r = &rooms[i];
+ bool mapped = r->room != 255 && bit(g_pd.rooms_mapped, r->room);
+ return r->rough || (mapped && pd_flag(PDF_HAS_QUILL));
+}
+
+static bool pin_shown(const MapPin *p) {
+ if (p->kind == 1) return pd_flag(PDF_HAS_PIN_COCOON) && rooms[p->room].room != 255 && bit(g_pd.rooms_cocoon, rooms[p->room].room);
+ return pd_flag(p->f1) && (p->f2 < 0 || pd_flag(p->f2));
+}
+
+/* the area's map at (ox, oy), k HUD units a map unit (its sprites made at the quick map's), the next areas' arrows or
+ * not */
+static void draw_area(int a, float ox, float oy, float k, bool quick) {
+ float sk = k / MAP_QUICK_K;
+ uint8_t white = gfx_dyn_tint(16, 255, 255, 255, 255);
+ for (int i = areas[a].first; i < areas[a].first + areas[a].n; i++) {
+ const MapRoom *r = &rooms[i];
+ if (!room_shown(i)) continue;
+ bool mapped = r->room != 255 && bit(g_pd.rooms_mapped, r->room);
+ hud_sprite(mapped && r->full >= 0 ? r->full : r->sprite, ox + r->x * k, oy + r->y * k, sk, 0, map_tint(r->rgb, 255));
+ }
+ /* (the pins: the HUD camera's layer 30, as Map Key Pref has it) */
+ for (unsigned i = 0; i < sizeof pins / sizeof pins[0]; i++) {
+ const MapPin *p = &pins[i];
+ if (rooms[p->room].area != a || !room_shown(p->room) || !pin_shown(p)) continue;
+ hud_sprite(p->sprite, ox + p->x * k, oy + p->y * k, sk, 0, white);
+ }
+ for (unsigned i = 0; i < sizeof names / sizeof names[0]; i++) {
+ const MapName *n = &names[i];
+ if (n->area != a || (n->room >= 0 && !room_shown(n->room)) || (quick && n->world_only)) continue;
+ hud_text(n->text, STYLE_MSG, ox + n->x * k, oy + n->top * k, n->align, n->rgb, 1);
+ }
+ if (!quick) return;
+ for (unsigned i = 0; i < sizeof nexts / sizeof nexts[0]; i++) {
+ const MapNext *n = &nexts[i];
+ if (rooms[n->room].area != a || !room_shown(n->room) || (n->visited >= 0 && !pd_flag(n->visited))) continue;
+ hud_sprite(n->sprite, ox + n->x * k, oy + n->y * k, sk, n->ang, white);
+ hud_text(n->text, STYLE_MSG, ox + n->tx * k, oy + n->top * k, n->align, 0xFFFFFF, 1);
+ }
+}
+
+/* the compass (the Knight's room's place on the map, as far across it as he is across the room) */
+static bool compass_at(float ox, float oy, float k, float *x, float *y) {
+ for (int i = 0; i < NMROOMS; i++) {
+ const MapRoom *r = &rooms[i];
+ if (r->room != g_room.id || r->w <= 0 || !g_room.h || g_room.h->w <= 0 || g_room.h->h <= 0) continue;
+ *x = ox + (r->x - r->w / 2 + g_hero.body.x / g_room.h->w * r->w) * k;
+ *y = oy + (r->y - r->h / 2 + g_hero.body.y / g_room.h->h * r->h) * k;
+ return true;
+ }
+ return false;
+}
+
+/* the shade's mark: the middle of the room it is in (PlayerData's shadeMapPos) */
+static bool shade_at(float ox, float oy, float k, float *x, float *y) {
+ if (!g_pd.soul_limited) return false;
+ for (int i = 0; i < NMROOMS; i++) {
+ const MapRoom *r = &rooms[i];
+ if (r->room == 255 || strcmp(room_name(r->room), g_pd.shade_scene)) continue;
+ *x = ox + r->x * k, *y = oy + r->y * k;
+ return true;
+ }
+ return false;
+}
+
+static void draw_marks(float ox, float oy, float k) {
+ static const struct { int16_t sprite; float dx, dy; uint8_t a; } shade[2] = MAP_SHADE;
+ static const int16_t markers[4] = MAP_MARKERS;
+ float sk = k / MAP_QUICK_K, x, y;
+ if (shade_at(ox, oy, k, &x, &y))
+ for (int i = 0; i < 2; i++)
+ hud_sprite(shade[i].sprite, x + shade[i].dx * k, y + shade[i].dy * k, sk, 0, map_tint(0xFFFFFF, shade[i].a));
+ uint8_t white = gfx_dyn_tint(16, 255, 255, 255, 255);
+ for (int c = 0; c < 4; c++)
+ for (int m = 0; m < g_pd.markers_placed[c] && m < 6; m++)
+ hud_sprite(markers[c], ox + g_pd.markers[c][m][0] * 0.01f * k, oy + g_pd.markers[c][m][1] * 0.01f * k, sk, 0, white);
+ if (charm_on(2) && mc.compass.sprite >= 0 && compass_at(ox, oy, k, &x, &y))
+ hud_sprite(mc.compass.sprite, x, y, MAP_COMPASS_K * k, 0, white);
+}
+
+static void map_msg_draw(void);
+
+void map_draw(void) {
+ tint_n = 0;
+ map_msg_draw();
+ if (mc.bg_a <= 0 && mc.name_a <= 0 && mc.nomap_a <= 0) return;
+ float bga = MAP_BG_A * mc.bg_a;
+ if (bga > 0) gfx_hud_fill(-15, -9, 15, 9, gfx_dyn_tint(27, 0, 0, 0, (uint8_t)(bga * 255 + 0.5f)));
+ if (mc.shown && mc.area >= 0) {
+ const MapArea *ar = &areas[mc.area];
+ draw_area(mc.area, ar->qx, ar->qy, MAP_QUICK_K, true);
+ draw_marks(ar->qx, ar->qy, MAP_QUICK_K);
+ }
+ /* the area's name on its backboard; no map: its symbol and line */
+ static const struct { float x, top; } title = MAP_TITLE;
+ static const struct { int16_t sprite; float x, y, kx, ky; uint8_t a; } back = MAP_TITLE_BACK;
+ if (mc.name_a > 0 && mc.area >= 0) {
+ Inst in;
+ sprite_inst(back.sprite, back.x, back.y, 0, back.kx, back.ky, map_tint(0xFFFFFF, (uint8_t)(back.a * mc.name_a)), &in);
+ gfx_hud(&in, 0);
+ hud_text(areas[mc.area].title, STYLE_DIALOGUE, title.x, title.top, 1, 0xFFFFFF, mc.name_a);
+ }
+ static const struct { int16_t sprite; float x, y; } nomap = MAP_NO_MAP;
+ static const struct { int16_t text; float x, top; } nomsg = MAP_NO_MAP_MSG;
+ if (mc.nomap_a > 0) {
+ hud_sprite(nomap.sprite, nomap.x, nomap.y, 1, 0, map_tint(0xFFFFFF, (uint8_t)(255 * mc.nomap_a)));
+ hud_text(nomsg.text, STYLE_DIALOGUE, nomsg.x, nomsg.top, 1, 0xFFFFFF, mc.nomap_a);
+ }
+}
+
+bool map_shown(void) { return mc.st != MC_INACTIVE && mc.st != MC_BUTTON_DOWN && mc.st != MC_CHECK_DOUBLE; }
+
+/* the quick map from a bench (Bench Control's Map Idle: OPEN QUICK MAP; Close Map: CLOSE QUICK MAP) */
+void map_quick(bool open) {
+ if (open) quick_open();
+ else quick_close();
+}
+
+/* ---------------------------------------------------------------- the map's update message */
+/* (Map Msg: up (0.3 s: its backboard, its line, its quill writing), 3 s, Map Complete, then down: the backboard and
+ * the line in 0.2 s, the quill in 1; gone after 1 s) */
+void map_msg_show(void) {
+ memset(&mm, 0, sizeof mm);
+ mm.on = true;
+ anim_play_from_frame(&mm.quill, CLIP_JOURNALMSG_MAP_WRITING, 0);
+}
+
+static void map_msg_tick(void) {
+ if (!mm.on) return;
+ mm.t += DT;
+ mm.quill.events = 0;
+ anim_update(&mm.quill, DT);
+ if (mm.t < 3.3f) {
+ mm.a = mm.quill_a = fminf(1, mm.t / 0.3f);
+ return;
+ }
+ if (mm.quill.clip != CLIP_JOURNALMSG_MAP_COMPLETE) anim_play_from_frame(&mm.quill, CLIP_JOURNALMSG_MAP_COMPLETE, 0);
+ float d = mm.t - 3.3f;
+ mm.a = fmaxf(0, 1 - d / 0.2f), mm.quill_a = fmaxf(0, 1 - d);
+ if (d >= 1) mm.on = false;
+}
+
+static void map_msg_draw(void) {
+ static const struct { float x, y, qx, qy, tx, ty; int16_t text, sprite; float bx, by, kx, ky; uint8_t a; } m = MAP_MSG;
+ if (!mm.on) return;
+ const float k = MAP_MSG_K;
+ Inst in;
+ if (mm.a > 0) {
+ sprite_inst(m.sprite, m.x + m.bx, m.y + m.by, 0, m.kx, m.ky, map_tint(0xFFFFFF, (uint8_t)(m.a * mm.a)), &in);
+ gfx_hud(&in, 0);
+ /* (its line: left aligned, its middle on its place) */
+ const uint8_t *st = font_style(STYLE_MSG);
+ const uint8_t *s = text_get(m.text);
+ int n = (int)strlen((const char *)s);
+ float py = VIEW_H / 2 - (m.y + m.ty) * HUD_PX + (font_asc(st) - font_desc(st)) / 2;
+ gfx_text(STYLE_MSG, VIEW_W / 2 + (m.x + m.tx) * HUD_PX, py, s, n, (uint32_t)(mm.a * 255 + 0.5f) << 24 | 0xFFFFFF, 0);
+ }
+ if (mm.quill_a > 0 && mm.quill.sprite >= 0) {
+ sprite_inst(mm.quill.sprite, m.x + m.qx, m.y + m.qy, 0, k, k, map_tint(0xFFFFFE, (uint8_t)(255 * mm.quill_a)), &in);
+ gfx_hud(&in, 0);
+ }
+ (void)k;
+}
diff --git a/games/hollowknight/src/msg.c b/games/hollowknight/src/msg.c
index ca4e94a5..a522b0d1 100644
--- a/games/hollowknight/src/msg.c
+++ b/games/hollowknight/src/msg.c
@@ -73,11 +73,19 @@ static void fade_tick(Fade *f) {
}
void prompt_blanker(bool up) { fade_start(&pb, up ? 0.6667f : 0, 0.85f, 0); }
+
+/* the first map's lesson (First Map: FIRST MAP UP, DOWN): its parts up in 1 s after half a second, the stop after 2 in
+ * 0.1; down in 1 (the stop 0.1) */
+static Fade fm, fm_stop;
+void first_map_prompt(bool up) {
+ fade_start(&fm, up ? 1 : 0, 1, up ? 0.5f : 0);
+ fade_start(&fm_stop, up ? 1 : 0, 0.1f, up ? 2 : 0);
+}
void focus_prompt_fade(bool up) { fade_start(&fp, up ? 1 : 0, up ? 1 : 0.15f, up ? 3 : 0); }
void white_blanker_reset(void) {
wb.on = false, wb.alpha = 0, wb.time = 1;
- memset(&pb, 0, sizeof pb), memset(&fp, 0, sizeof fp);
+ memset(&pb, 0, sizeof pb), memset(&fp, 0, sizeof fp), memset(&fm, 0, sizeof fm), memset(&fm_stop, 0, sizeof fm_stop);
}
static void white_blanker_tick(void) {
@@ -90,7 +98,7 @@ static void white_blanker_tick(void) {
void msg_tick(void) {
white_blanker_tick();
- fade_tick(&pb), fade_tick(&fp);
+ fade_tick(&pb), fade_tick(&fp), fade_tick(&fm), fade_tick(&fm_stop);
notices_tick();
if (m.st == MS_OFF) return;
uint32_t pressed = g_hero.keys & ~m.prev_keys;
@@ -284,6 +292,28 @@ static void key_box(int text, float x, float y, float a, int slot) {
line(text, STYLE_PROMPT, kx, y, 0, false, a);
}
+static void first_map_draw(void) {
+ static const struct { int16_t text; float x, top; } rows[4] = FIRSTMAP_TEXTS;
+ static const struct { int16_t sprite; float x, y, kx, ky; } parts[3] = FIRSTMAP_PIECES;
+ static const struct { int16_t text; float x, y; } key = FIRSTMAP_KEY;
+ float a = fm.alpha;
+ if (a <= 0 && fm_stop.alpha <= 0) return;
+ if (a > 0) gfx_hud_fill(-15, -9, 15, 9, gfx_dyn_tint(26, 0, 0, 0, (uint8_t)(FIRSTMAP_BG_A * a * 255 + 0.5f)));
+ for (int i = 0; i < 3; i++) {
+ float pa = i == 2 ? fm_stop.alpha : a;
+ uint8_t al = (uint8_t)(pa * 255 + 0.5f);
+ if (!al) continue;
+ Inst in;
+ sprite_inst(parts[i].sprite, parts[i].x, parts[i].y, 0, parts[i].kx, parts[i].ky, gfx_dyn_tint(29 + i, 255, 255, 255, al), &in);
+ gfx_hud(&in, 0);
+ }
+ static const int styles[4] = {STYLE_MSG_NAME, STYLE_MSG, STYLE_MSG, STYLE_MSG};
+ for (int i = 0; i < 4; i++) line(rows[i].text, styles[i], rows[i].x, rows[i].top, 0, true, a);
+ /* (the key: its box about its place) */
+ float w = line(key.text, STYLE_PROMPT, 0, key.y, 0, false, 0) / HUD_PX + 0.5f;
+ key_box(key.text, key.x - w / 2, key.y, a, 25);
+}
+
static void focus_prompt_draw(void) {
static const struct { int16_t sprite; float x, y, kx, ky; } bg = FOCUS_PROMPT_BG;
static const struct { int16_t text; float x, top; int8_t align; } rows[4] = FOCUS_PROMPT_TEXTS;
@@ -304,6 +334,7 @@ void msg_draw(void) {
float ba = 1 - (1 - (blank_on && blank_alpha > 0 ? blank_alpha : 0)) * (1 - pb.alpha);
if (ba > 0) gfx_hud_fill(-15, -9, 15, 9, gfx_dyn_tint(27, 0, 0, 0, (uint8_t)(ba * 255 + 0.5f)));
focus_prompt_draw(); /* (while the menus cannot be up: their tints') */
+ first_map_draw();
notices_draw();
if (m.st == MS_OFF) return;
const int16_t *t = table[m.item];
diff --git a/games/hollowknight/src/npc.c b/games/hollowknight/src/npc.c
index 71ae50a3..acbbb1f8 100644
--- a/games/hollowknight/src/npc.c
+++ b/games/hollowknight/src/npc.c
@@ -8,7 +8,8 @@
enum {
BS_IDLE, BS_IN_RANGE, BS_CANCEL_FRAME, BS_START_REST, BS_SAVE_FRAME, BS_PAUSE, BS_RESTING_INIT, BS_RESTING,
- BS_WAKE, BS_GET_OFF, BS_IDLE_PAUSE, BS_REGAIN, BS_RESPAWN_ASLEEP, BS_STARTLE
+ BS_WAKE, BS_GET_OFF, BS_IDLE_PAUSE, BS_REGAIN, BS_RESPAWN_ASLEEP, BS_STARTLE, BS_MAP_UPDATE, BS_MAP_OPEN, BS_MAP_IDLE,
+ BS_MAP_CLOSE, BS_INV_MAP
};
typedef struct {
@@ -144,7 +145,19 @@ void benches_tick(void) {
case BS_PAUSE:
if (b->t >= 0.1f) {
save_game();
- /* (no map, no charm message yet) Resting Init: 0.5 s */
+ /* Update Map: with the quill and a map, the rooms visited mapped (Map Update, its message); Resting Init */
+ b->t = 0;
+ if (pd_flag(PDF_HAS_QUILL) && pd_flag(PDF_HAS_MAP) && map_update()) {
+ anim_play_from_frame(&h->anim, CLIP_KNIGHT_MAP_UPDATE, 0);
+ map_msg_show();
+ b->state = BS_MAP_UPDATE;
+ } else
+ b->state = BS_RESTING_INIT;
+ }
+ break;
+ case BS_MAP_UPDATE:
+ if ((h->anim.events & ANIM_DONE) || !h->anim.playing) {
+ anim_play(&h->anim, CLIP_KNIGHT_SIT_IDLE); /* (Sit Idle) */
b->state = BS_RESTING_INIT, b->t = 0;
}
break;
@@ -161,6 +174,12 @@ void benches_tick(void) {
else hero_face(false);
b->state = BS_WAKE, b->t = 0;
if (b->sleeping) anim_play_from_frame(&h->anim, CLIP_KNIGHT_WAKE_TO_SIT, 0);
+ } else if ((p & K_MAP) && pd_flag(PDF_HAS_MAP) && !inv_open()) {
+ /* Open Map: Sit Map Open; tapped again soon, the inventory's map */
+ anim_play_from_frame(&h->anim, CLIP_KNIGHT_SIT_MAP_OPEN, 0);
+ g_pd.disable_pause = true;
+ b->sleeping = false, b->get_off_wake = false;
+ b->state = BS_MAP_OPEN, b->t = 0;
} else if (b->t >= 10 && !b->sleeping) {
/* Fall Asleep */
anim_play(&h->anim, CLIP_KNIGHT_SIT_FALL_ASLEEP);
@@ -190,6 +209,35 @@ void benches_tick(void) {
case BS_REGAIN:
if (b->t >= 0.5f) b->state = BS_IDLE; /* (Reactivate: Idle, in range or not) */
break;
+ case BS_MAP_OPEN:
+ if (pressed() & K_MAP) {
+ /* Inv Map Open */
+ g_pd.disable_pause = false;
+ inv_open_map();
+ anim_play_from_frame(&h->anim, CLIP_KNIGHT_SIT_MAP_CLOSE, 0);
+ b->state = BS_INV_MAP, b->t = 0;
+ } else if (b->t >= 0.25f) {
+ map_quick(true); /* (Map Idle: OPEN QUICK MAP) */
+ b->state = BS_MAP_IDLE;
+ }
+ break;
+ case BS_MAP_IDLE:
+ if (!(g_hero.keys & K_MAP) || inv_open()) {
+ /* Close Map: Sit Map Close, a second, then pause again (Re-enable Pause) */
+ map_quick(false);
+ anim_play_from_frame(&h->anim, CLIP_KNIGHT_SIT_MAP_CLOSE, 0);
+ b->state = BS_MAP_CLOSE, b->t = 0;
+ }
+ break;
+ case BS_MAP_CLOSE:
+ if (b->t >= 1) {
+ g_pd.disable_pause = false;
+ b->state = BS_RESTING, b->t = 0;
+ }
+ break;
+ case BS_INV_MAP:
+ if (b->t >= 0.42f) b->state = BS_RESTING, b->t = 0;
+ break;
case BS_RESPAWN_ASLEEP:
/* Init Resting 2 (1.2 s), three frames, Kinemetise (up by the adjust vector), Init Resting (1.2 s): asleep,
* then Startle */
@@ -204,6 +252,8 @@ void benches_tick(void) {
h->body.vx = h->body.vy = 0;
if ((h->anim.events & ANIM_DONE) || !h->anim.playing) {
b->get_off_wake = false, b->sleeping = false; /* (Startle: Get Off Anim "Get Off") */
+ /* (Update Map Silently: its message, no Map Update) */
+ if (pd_flag(PDF_HAS_QUILL) && pd_flag(PDF_HAS_MAP) && map_update()) map_msg_show();
b->state = BS_RESTING, b->t = 0;
}
break;
diff --git a/games/hollowknight/src/obj.c b/games/hollowknight/src/obj.c
index 2e4b643b..43baadae 100644
--- a/games/hollowknight/src/obj.c
+++ b/games/hollowknight/src/obj.c
@@ -685,6 +685,7 @@ static void cocoon_hit(Obj *o, const Ent *e) {
}
cam_shake(SHAKE_ENEMY_KILL);
persist_set(e->persist);
+ map_cocoon_broken();
cocoon_broken(o, e);
}
diff --git a/games/hollowknight/src/save.c b/games/hollowknight/src/save.c
index 37e17daa..da250224 100644
--- a/games/hollowknight/src/save.c
+++ b/games/hollowknight/src/save.c
@@ -5,7 +5,7 @@
#include "game.h"
#define SAVE_MAGIC 0x56534B48u /* "HKSV" */
-#define SAVE_VERSION 1
+#define SAVE_VERSION 2 /* (1: PlayerData up to PD_SAVED_V1, loaded with the rest cleared) */
typedef struct {
uint32_t magic, version, size, crc; /* (size, crc: of what follows the header) */
@@ -62,28 +62,31 @@ bool save_game(void) {
return plat_save(name, buf, at);
}
-/* a slot's file, checked: its PlayerData part, its states' names */
-static const uint8_t *checked(int slot, uint32_t *count) {
+/* a slot's file, checked: its PlayerData part (*pd_size long: its version's), its states' names */
+static const uint8_t *checked(int slot, uint32_t *count, uint32_t *pd_size) {
char name[8];
slot_name(slot, name);
uint32_t len;
const uint8_t *p = plat_load(name, &len);
SaveHead h;
- if (!p || len < sizeof h + PD_SAVED + 4) return NULL;
+ if (!p || len < sizeof h) return NULL;
memcpy(&h, p, sizeof h);
- if (h.magic != SAVE_MAGIC || h.version != SAVE_VERSION || h.size != len - sizeof h || h.crc != crc32(p + sizeof h, h.size))
+ uint32_t pd = h.version == SAVE_VERSION ? PD_SAVED : h.version == 1 ? PD_SAVED_V1 : 0;
+ if (h.magic != SAVE_MAGIC || !pd || len < sizeof h + pd + 4 || h.size != len - sizeof h ||
+ h.crc != crc32(p + sizeof h, h.size))
return NULL;
- memcpy(count, p + sizeof h + PD_SAVED, 4);
- if (sizeof h + PD_SAVED + 4 + 4ull * *count != len) return NULL;
+ memcpy(count, p + sizeof h + pd, 4);
+ if (sizeof h + pd + 4 + 4ull * *count != len) return NULL;
+ *pd_size = pd;
return p + sizeof h;
}
int save_stats(int slot, SaveStats *st) {
char name[8];
slot_name(slot, name);
- uint32_t len, count;
+ uint32_t len, count, pd;
if (!plat_load(name, &len)) return 0;
- const uint8_t *p = checked(slot, &count);
+ const uint8_t *p = checked(slot, &count, &pd);
if (!p) return -1;
/* (its PlayerData's fields, read where they are) */
memcpy(&st->max_health, p + offsetof(PlayerData, max_health), sizeof st->max_health);
@@ -101,22 +104,25 @@ bool save_clear(int slot) {
}
bool save_exists(int slot) {
- uint32_t count;
- return checked(slot, &count) != NULL;
+ uint32_t count, pd;
+ return checked(slot, &count, &pd) != NULL;
}
bool save_load(int slot) {
- uint32_t count;
- const uint8_t *p = checked(slot, &count);
+ uint32_t count, pd;
+ const uint8_t *p = checked(slot, &count, &pd);
if (!p) return false;
save_select(slot);
memset(&g_pd, 0, sizeof g_pd);
- memcpy(&g_pd, p, PD_SAVED);
+ memcpy(&g_pd, p, pd);
+ /* (counts kept within their arrays whatever the file says) */
+ for (int c = 0; c < 4; c++)
+ if (g_pd.markers_placed[c] > 6) g_pd.markers_placed[c] = 6;
/* (names kept within their bounds whatever the file says) */
g_pd.respawn_scene[SCENE_NAME - 1] = g_pd.respawn_marker[SCENE_NAME - 1] = g_pd.shade_scene[SCENE_NAME - 1] = 0;
uint32_t nbits;
const uint8_t *names = phash(&nbits);
- const uint8_t *q = p + PD_SAVED + 4;
+ const uint8_t *q = p + pd + 4;
for (uint32_t k = 0; k < count; k++, q += 4) {
uint32_t want = rd32(q);
for (uint32_t i = 0; i < nbits && i < MAX_PERSIST; i++)
diff --git a/games/hollowknight/src/vm.c b/games/hollowknight/src/vm.c
index ebf73346..2514f8e5 100644
--- a/games/hollowknight/src/vm.c
+++ b/games/hollowknight/src/vm.c
@@ -453,6 +453,9 @@ static void fsm_event(Fsm *f, int ev) {
fsm_start(f);
}
int s = transition(f, ev);
+#ifdef HOST
+ if (getenv("VMACT") && atoi(getenv("VMACT")) == (int)(f - vm.fsms)) printf(" event fsm %d state %d ev %d -> %d\n", (int)(f - vm.fsms), f->state, ev, s);
+#endif
if (s < 0) return;
f->next = (uint8_t)s;
if (vm.executing != f) run_switches(f); /* (from another: at once) */
@@ -544,6 +547,7 @@ static void game_event(int ev) {
if (ev >= VMEV_BG_CLOSE && ev <= VMEV_BG_DESTROY) gates_event(ev - VMEV_BG_CLOSE);
else if (ev == VMEV_NPC_TITLE_DOWN) title_npc_down();
else if (ev == VMEV_NPC_CONVO_START) title_npc_convo_start();
+ else if (ev == VMEV_FIRST_MAP_UP || ev == VMEV_FIRST_MAP_DOWN) first_map_prompt(ev == VMEV_FIRST_MAP_UP);
}
/* (an object's alpha to `to` in t seconds, after `wait` steps) */
@@ -800,6 +804,36 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
}
return true;
}
+ case VMOP_MAPUPDATEMSG:
+ map_msg_show();
+ return true;
+ case VMOP_UPDATEGAMEMAP:
+ set_var(f, rb(&r), map_update());
+ return true;
+ case VMOP_CONVERTINTTOFLOAT: {
+ int32_t x = (int32_t)val(f, rv(&r));
+ uint8_t v = rb(&r);
+ bool every = rb(&r);
+ set_f(f, v, (float)x);
+ return !every;
+ }
+ case VMOP_CONVERTFLOATTOINT: {
+ /* (FloatRounding: down, up, the nearest) */
+ float x = fval(f, rv(&r));
+ uint8_t v = rb(&r);
+ int mode = rb(&r);
+ bool every = rb(&r);
+ set_var(f, v, (uint32_t)(int32_t)(mode == 0 ? floorf(x) : mode == 1 ? ceilf(x) : roundf(x)));
+ return !every;
+ }
+ case VMOP_SENDEVENTBYSCALE: {
+ /* (its x scale: positive or negative) */
+ int o = oval(f, rv(&r));
+ int pos = rb(&r), neg = rb(&r);
+ float sx = o == O_HERO ? (g_hero.cs.facing_right ? -1.0f : 1.0f) : obj_ok(o) ? vm.objs[o].sx : 1;
+ fsm_event(f, sx >= 0 ? pos : neg);
+ return true;
+ }
case VMOP_DIALOGUEPLACE: {
int which = rb(&r);
dialogue_place(which, fval(f, rv(&r)));
@@ -1295,12 +1329,13 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {
case VMOP_LISTENFORATTACK:
case VMOP_LISTENFORJUMP:
case VMOP_LISTENFORCAST:
+ case VMOP_LISTENFORQUICKMAP:
case VMOP_LISTENFORINVENTORY: {
int ev = rb(&r);
if (mode != M_UPDATE) return false;
uint32_t k = op == VMOP_LISTENFORUP ? K_UP : op == VMOP_LISTENFORDOWN ? K_DOWN : op == VMOP_LISTENFORLEFT ? K_LEFT
: op == VMOP_LISTENFORRIGHT ? K_RIGHT : op == VMOP_LISTENFORATTACK ? K_ATTACK : op == VMOP_LISTENFORJUMP ? K_JUMP
- : op == VMOP_LISTENFORINVENTORY ? K_INV : K_SPELL;
+ : op == VMOP_LISTENFORINVENTORY ? K_INV : op == VMOP_LISTENFORQUICKMAP ? K_MAP : K_SPELL;
if (pressed_keys() & k) fsm_event(f, ev);
return false;
}
@@ -1688,6 +1723,9 @@ static void fsm_step(Fsm *f, int mode) {
vm.executing = f;
for (int i = 0; i < st[1]; i++, a += 2 + a[1]) {
if (f->done >> i & 1) continue;
+#ifdef HOST
+ if (getenv("VMACT") && atoi(getenv("VMACT")) == (int)(f - vm.fsms)) printf(" act fsm %d state %d op %d mode %d\n", (int)(f - vm.fsms), f->state, a[0], mode);
+#endif
if (act(f, a, mode)) f->done |= (uint64_t)1 << i;
if (f->epoch != epoch) break;
}
diff --git a/games/hollowknight/src/world.c b/games/hollowknight/src/world.c
index 4421c9da..32ba1c5a 100644
--- a/games/hollowknight/src/world.c
+++ b/games/hollowknight/src/world.c
@@ -141,6 +141,7 @@ void world_enter(void) {
/* (SceneManager: the room's map zone, PlayerData's) */
static const uint8_t zones[NUM_ROOMS] = ROOM_ZONES;
if (g_room.id >= 0 && g_room.id < NUM_ROOMS) g_pd.map_zone = zones[g_room.id];
+ map_room_entered();
}
/* (Pause's WaitForHeroInPosition: the masks start as the Knight is placed; its Wait only counts when it was placed
diff --git a/games/hollowknight/tests/play.c b/games/hollowknight/tests/play.c
index 7d4529e3..560aaaf3 100644
--- a/games/hollowknight/tests/play.c
+++ b/games/hollowknight/tests/play.c
@@ -67,6 +67,7 @@ int main(int argc, char **argv) {
if (getenv("HKFIRE")) g_pd.fireball_level = atoi(getenv("HKFIRE"));
if (getenv("HKHORNETGP")) g_pd.hornet_greenpath = (uint8_t)atoi(getenv("HKHORNETGP"));
if (getenv("HKDASH")) g_pd.has_dash = true;
+ if (getenv("HKMAPPED")) memset(g_pd.rooms_mapped, 0xFF, sizeof g_pd.rooms_mapped); /* (every room mapped) */
if (getenv("HKTRINKETS")) /* (relics: "1,2,0,0") */
sscanf(getenv("HKTRINKETS"), "%hhu,%hhu,%hhu,%hhu", &g_pd.trinkets[0], &g_pd.trinkets[1], &g_pd.trinkets[2], &g_pd.trinkets[3]);
for (const char *f = getenv("HKFLAGS"); f && *f;) { /* (PlayerData bools on, by number: "7,8") */
diff --git a/games/hollowknight/tools/actors.py b/games/hollowknight/tools/actors.py
index 7145e268..250d4dac 100644
--- a/games/hollowknight/tools/actors.py
+++ b/games/hollowknight/tools/actors.py
@@ -149,6 +149,10 @@ ACTORS = {"knight": KNIGHT,
# the stag's menu: the map's selector, its borders unrolled up and down (on the HUD)
"stagui": ("resources.assets", 23333, ["Stag_Map_Selection_Cursor", "Stag_Border_Top Up", "Stag_Border_Top Down",
"Stag_Border_Bottom Up", "Stag_Border_Bottom Down"]),
+ # the map's compass (Compass Icon: the Knight, still and walking with the map)
+ "mapui": ("resources.assets", 23326, ["Idle", "Walk"]),
+ # (Map Update Msg's quill: writing, done)
+ "journalmsg": ("resources.assets", 21779, ["Map Writing", "Map Complete"]),
# (Gathering Swarm: the bug that brings geo, a child of each)
"geobug": ("resources.assets", 22564, ["Lamp_Bug_idle"]),
# the dialogue box (on the HUD, a third bigger with its text) and the prompt markers
@@ -237,7 +241,7 @@ K0 = scene.FOCAL / (0.004 - scene.CAMZ) # screen pixels a unit, where actors a
HUD_K = (scene.VIEW_H / 2) / 8.7107 # the HUD's (its orthographic camera)
# (actor, clip): drawn bigger or smaller than their sprites
ACTOR_RES = float(os.environ.get("HK_ACTOR_RES", "1"))
-ACTOR_SCALE = {"hud": HUD_K / K0, "shopui": HUD_K / K0, "stagui": HUD_K / K0, "liquid": 1.4 * HUD_K / K0, "dialogue": text.TEXT_K * HUD_K / K0}
+ACTOR_SCALE = {"hud": HUD_K / K0, "shopui": HUD_K / K0, "stagui": HUD_K / K0, "mapui": HUD_K / K0, "journalmsg": 0.7 * HUD_K / K0, "liquid": 1.4 * HUD_K / K0, "dialogue": text.TEXT_K * HUD_K / K0}
HUD_MASK = 0.7135
diff --git a/games/hollowknight/tools/gamemap.py b/games/hollowknight/tools/gamemap.py
new file mode 100644
index 00000000..6a30349e
--- /dev/null
+++ b/games/hollowknight/tools/gamemap.py
@@ -0,0 +1,238 @@
+"""The map (Game_Map: the areas' rooms as Cornifer drew them, rough until the quill maps them; their pins, the arrows to
+the areas next to them, the areas' names; the compass, the shade's mark) and the quick map's HUD (Quick Map): MAP_*
+defines for data.h (src/map.c). Places are in the map's units from its root; the HUD shows them at its scale."""
+import math
+import unity, text
+
+GAME_MAP = ("resources.assets", 4808)
+HUD = ("resources.assets", 5473)
+QUICK = "_GameCameras/HudCamera/Quick Map/"
+# the areas this part of the game has maps of: (Game_Map's child, the PlayerData bool that has its map (None: always),
+# the quick map's place for it (Quick Map: SetPosition), its name (Map Zones))
+AREAS = (("Town_Tutorial", None, (4.07, -11.62), "TOWN"),
+ ("Crossroads", "mapCrossroads", (-0.04, -7.88), "CROSSROADS"))
+QUICK_K, WORLD_K = 1.55, 1.45 # (the map's scale: the quick map's (Check Area), the world map's (its own))
+MAP_MSG = ("sharedassets7.assets", 539) # (Map Update Msg: what the bench makes as the map is updated)
+MAP_MSG_AT = (-1.29, -6.83) # (its Map Msg's Position)
+COCOON = "hasPinCocoon" # (pin_blue_health: SetupMap's, by the rooms a cocoon was broken in)
+
+
+def build(sprites, texts, res, rooms, pd_flags, room_zone):
+ """rooms: the rooms this part of the game has (their order); pd_flags: PlayerData bools -> flags; room_zone(room) ->
+ its map zone (SceneManager's mapZone)"""
+ d = unity.prefab(*GAME_MAP)
+ by = {o["path"]: o for o in d["objects"]}
+ byid = {o["id"]: o for o in d["objects"]}
+ kids = {}
+ for o in d["objects"]:
+ kids.setdefault(o.get("parent"), []).append(o)
+ U = lambda v: "%.4ff" % v
+ sh = text.sheets()
+ out = {}
+
+ def comp(o, cls):
+ return next((c["v"] for c in o["c"] if (c.get("class") or c["type"]) == cls and c.get("v") is not None), None)
+
+ def fsm(o):
+ return next((c["fsm"] for c in o["c"] if c.get("fsm")), None)
+
+ def flag(name):
+ """a PlayerData bool's flag; -2 one this part of the game never sets (so: never)"""
+ return pd_flags.get(name, -2) if name else -1
+
+ def scale(o):
+ """its scale in the map's units"""
+ k, q = 1.0, o
+ while q is not None and q["id"] != root["id"]:
+ k *= q["lscale"][0]
+ q = byid.get(q.get("parent"))
+ return k
+
+ def at(o):
+ """its place in the map's units from the map's root"""
+ x = y = 0.0
+ p = o
+ while p is not None and p["id"] != root["id"]:
+ k = scale(byid[p["parent"]]) if byid.get(p.get("parent")) and p["parent"] != root["id"] else 1.0
+ x += p["lpos"][0] * k
+ y += p["lpos"][1] * k
+ p = byid.get(p.get("parent"))
+ return x, y
+
+ def spr(ref, k, doc=d):
+ return sprites.id(doc, ref, k, res)
+
+ def tx(o, style, doc_k=1.0):
+ """a text's place (its rect's left, middle or right, as it is aligned), its rect's top, its color, its
+ alignment (0 left, 1 centred, 2 right)"""
+ tc, tm, gt = comp(o, "TextContainer"), comp(o, "TextMeshPro"), comp(o, "SetTextMeshProGameText")
+ k = scale(o) * doc_k
+ x, y = at(o)
+ w, h = tc["m_rect"]["width"] * k, tc["m_rect"]["height"] * k
+ al = tm["m_textAlignment"] % 4
+ assert al < 3, o["path"]
+ col = tm.get("m_fontColor") or {"r": 1, "g": 1, "b": 1}
+ rgb = (int(round(col["r"] * 255)) << 16) | (int(round(col["g"] * 255)) << 8) | int(round(col["b"] * 255))
+ t = texts.add(text.clean(sh[gt["sheetName"]][gt["convName"]]), style)
+ return t, x + (al / 2 - tc["m_pivot"]["x"]) * w, y + (1 - tc["m_pivot"]["y"]) * h, rgb, al
+
+ root = by["Game_Map"]
+ rows, pins, nexts, names, areas = [], [], [], [], []
+ for ai, (an, have, qpos, title) in enumerate(AREAS):
+ a = by["Game_Map/" + an]
+ first = len(rows)
+ zones = 0
+ for r in kids.get(a["id"], []):
+ sr = comp(r, "SpriteRenderer")
+ cls = {(c.get("class") or c["type"]) for c in r["c"]}
+ if "TextMeshPro" in cls:
+ # (the area's name: the world map's only; a sub area's: both)
+ t, mx, top, rgb, al = tx(r, "MSG")
+ world_only = "DisplayOnWorldMapOnly" in cls or fsm(r) is not None
+ names.append("{%d, -1, %d, %s, %s, 0x%06X, %d, %d}" % (ai, t, U(mx), U(top), rgb, al, world_only))
+ continue
+ if r["name"] == "Grub Pins":
+ continue # (the Collector's Map's: not here)
+ rm = comp(r, "RoughMapRoom")
+ ri = rooms.index(r["name"]) if r["name"] in rooms else 255
+ rough = bool(r["self_active"] and rm)
+ if ri == 255 and not rough:
+ continue # (never mapped here, never shown)
+ if ri != 255:
+ zones |= 1 << room_zone(r["name"])
+ k = scale(r)
+ x, y = at(r)
+ if sr is not None and sr.get("m_Sprite"):
+ col = sr["m_Color"]
+ rgb = sum(int(round(col[c] * 255)) << (16 - 8 * i) for i, c in enumerate("rgb"))
+ s = unity.sprite(d["level"], d["externals"], *sr["m_Sprite"])
+ sid = spr(sr["m_Sprite"], QUICK_K * k)
+ full = spr(rm["fullSprite"], QUICK_K * k) if rm else -1
+ w, h = s.w / s.ppu * k, s.h / s.ppu * r["lscale"][1] * k / r["lscale"][0]
+ else:
+ sid, full, w, h, rgb = -1, -1, 0, 0, 0 # (Crossroads_ShamanTemple: its pins only)
+ rows.append("{%d, %d, %d, %d, %s, %s, %s, %s, 0x%06X, %d}" % (ai, ri, sid, full, U(x), U(y), U(w), U(h), rgb,
+ rough))
+ mi = len(rows) - 1
+ for q in kids.get(r["id"], []):
+ qc = {(c.get("class") or c["type"]) for c in q["c"]}
+ if q["name"].startswith("pin_") and "SpriteRenderer" in qc:
+ f = fsm(q)
+ if f is not None:
+ # (pin FSM: its Pin Type Bool, its Specific Bool)
+ kind, f1, f2 = 0, flag(f["vars"]["Pin Type Bool"][1]), flag(f["vars"]["Specific Bool"][1])
+ elif q["name"] == "pin_blue_health":
+ kind, f1, f2 = 1, flag(COCOON), -1
+ else:
+ continue # (pin_dream_tree: the dream nail's)
+ if f1 == -2 or f2 == -2:
+ continue
+ px, py = at(q)
+ pins.append("{%d, %d, %d, %s, %s, %d, %d}" % (
+ mi, kind, spr(comp(q, "SpriteRenderer")["m_Sprite"], QUICK_K * scale(q)), U(px), U(py), f1, f2))
+ elif "TextMeshPro" in qc:
+ # (a sub area's name: shown with its room)
+ t, mx, top, rgb, al = tx(q, "MSG")
+ names.append("{%d, %d, %d, %s, %s, 0x%06X, %d, %d}" % (ai, mi, t, U(mx), U(top), rgb, al,
+ "DisplayOnWorldMapOnly" in qc))
+ elif "MapNextAreaDisplay" in qc:
+ # (an arrow to the area next to it, and its name: the quick map's, once that area was visited)
+ vs = comp(q, "MapNextAreaDisplay")["visitedString"]
+ vf = flag(vs) if vs else -1
+ if vf == -2:
+ continue
+ arrow = next(z for z in kids[q["id"]] if z["name"] == "Map_Arrow")
+ nm = next(z for z in kids[q["id"]] if z["name"] == "Area Name")
+ m3 = arrow["m3"]
+ ang = math.degrees(math.atan2(m3[3], m3[0]))
+ ax, ay = at(arrow)
+ t, mx, top, rgb, al = tx(nm, "MSG")
+ nexts.append("{%d, %d, %s, %s, %s, %d, %s, %s, %d, %d}" % (
+ mi, spr(comp(arrow, "SpriteRenderer")["m_Sprite"], QUICK_K * scale(arrow)), U(ax), U(ay),
+ U(ang), t, U(mx), U(top), al, vf))
+ areas.append("{%d, %d, %d, %s, %s, %d, 0x%Xu}" % (first, len(rows) - first, flag(have) if have else -1,
+ U(qpos[0]), U(qpos[1]),
+ texts.add(text.clean(sh["Map Zones"][title]), "DIALOGUE"), zones))
+ out["MAP_AREAS"] = "{%s}" % ", ".join(areas)
+ out["MAP_ROOMS"] = "{%s}" % ", ".join(rows)
+ out["MAP_PINS"] = "{%s}" % ", ".join(pins)
+ out["MAP_NEXT"] = "{%s}" % ", ".join(nexts)
+ out["MAP_NAMES"] = "{%s}" % ", ".join(names)
+ out["MAP_QUICK_K"], out["MAP_WORLD_K"] = U(QUICK_K), U(WORLD_K)
+ # the shade's mark (Shade Pos: its fader, its head), the markers (Map Markers: B1, R1, Y1, W1)
+ sp = by["Game_Map/Shade Pos"]
+ parts = []
+ for n in ("Map_shade_fader", "Map_shade_head"):
+ q = by["Game_Map/Shade Pos/" + n]
+ v = comp(q, "SpriteRenderer")
+ parts.append("{%d, %s, %s, %d}" % (spr(v["m_Sprite"], QUICK_K * scale(q)), U(q["lpos"][0] * sp["lscale"][0]),
+ U(q["lpos"][1] * sp["lscale"][1]), int(round(v["m_Color"]["a"] * 255))))
+ out["MAP_SHADE"] = "{%s}" % ", ".join(parts)
+ out["MAP_MARKERS"] = "{%s}" % ", ".join(
+ str(spr(comp(by["Game_Map/Map Markers/%s1" % c], "SpriteRenderer")["m_Sprite"],
+ QUICK_K * scale(by["Game_Map/Map Markers/%s1" % c]))) for c in "BRYW")
+ out["MAP_COMPASS_K"] = U(scale(by["Game_Map/Compass Icon"]))
+ # the quick map's HUD: its backdrop (BG: black, its color's alpha at its fade group's full), the area's name (its
+ # rect's middle and top, on its backboard), the no map message (its symbol, its line)
+ h = unity.prefab(*HUD)
+ hb = {o["path"]: o for o in h["objects"]}
+ bg = hb[QUICK + "BG"]
+ out["MAP_BG_A"] = U(comp(bg, "SpriteRenderer")["m_Color"]["a"] * comp(bg, "FadeGroup")["fullAlpha"])
+ an = hb[QUICK + "Area Name"]
+ tc = comp(an, "TextContainer")
+ k = an["lscale"][1]
+ out["MAP_TITLE"] = "{%s, %s}" % (U(an["pos"][0]), U(an["pos"][1] + (1 - tc["m_pivot"]["y"]) * tc["m_rect"]["height"] * k))
+ bb = hb[QUICK + "Area Name/Backboard"]
+ v = comp(bb, "SpriteRenderer")
+ out["MAP_TITLE_BACK"] = "{%d, %s, %s, %s, %s, %d}" % (
+ sprites.id(h, v["m_Sprite"], max(bb["m3"][0], bb["m3"][4]), res), U(bb["pos"][0]), U(bb["pos"][1]),
+ U(bb["m3"][0] / max(bb["m3"][0], bb["m3"][4])), U(bb["m3"][4] / max(bb["m3"][0], bb["m3"][4])),
+ int(round(v["m_Color"]["a"] * 255)))
+ sym = hb[QUICK + "No Map/No_Map_symbol"]
+ out["MAP_NO_MAP"] = "{%d, %s, %s}" % (sprites.id(h, comp(sym, "SpriteRenderer")["m_Sprite"], sym["lscale"][0], res),
+ U(sym["pos"][0]), U(sym["pos"][1]))
+ msg = hb[QUICK + "No Map/Msg"]
+ tc = comp(msg, "TextContainer")
+ out["MAP_NO_MAP_MSG"] = "{%d, %s, %s}" % (
+ texts.add(text.clean(sh["Prompts"]["NO_MAP"]), "DIALOGUE"), U(msg["pos"][0]),
+ U(msg["pos"][1] + (1 - tc["m_pivot"]["y"]) * tc["m_rect"]["height"] * msg["lscale"][1]))
+ # the map's update message (Map Update Msg: made at the HUD's (-1.29, -6.83) at its scale; its quill writing, its
+ # line (left aligned, its middle), its large backboard)
+ mm = unity.prefab(*MAP_MSG)
+ mb = {o["path"]: o for o in mm["objects"]}
+ r0 = mb["Map Update Msg"]
+ k0 = r0["lscale"][0]
+ rel = lambda o: ((o["pos"][0] - r0["pos"][0]), (o["pos"][1] - r0["pos"][1]))
+ an = mb["Map Update Msg/Animation"]
+ tq = mb["Map Update Msg/Text"]
+ tc = comp(tq, "TextContainer")
+ bb = mb["Map Update Msg/Backboard Large"]
+ v = comp(bb, "SpriteRenderer")
+ kx, ky = math.hypot(bb["m3"][0], bb["m3"][3]), math.hypot(bb["m3"][1], bb["m3"][4])
+ out["MAP_MSG"] = "{%s, %s, %s, %s, %s, %s, %d, %d, %s, %s, %s, %s, %d}" % (
+ U(MAP_MSG_AT[0]), U(MAP_MSG_AT[1]), U(rel(an)[0]), U(rel(an)[1]),
+ U(rel(tq)[0] - tc["m_pivot"]["x"] * tc["m_rect"]["width"] * k0), U(rel(tq)[1]),
+ texts.add(text.clean(sh["UI"]["MAP_UPDATED"]), "MSG"),
+ sprites.id(mm, v["m_Sprite"], max(kx, ky), res), U(rel(bb)[0]), U(rel(bb)[1]), U(kx / max(kx, ky)),
+ U(ky / max(kx, ky)), int(round(v["m_Color"]["a"] * 255)))
+ out["MAP_MSG_K"] = U(k0)
+ # the first map's lesson (Prompts/First Map, on FIRST MAP UP): its backdrop's alpha, its lines (their middles and
+ # rects' tops: the title in the item message's name style), its picture, its divider, the stop, the key's place
+ fm = lambda n: hb["_GameCameras/HudCamera/Prompts/First Map/" + n]
+ out["FIRSTMAP_BG_A"] = U(comp(fm("BG"), "SpriteRenderer")["m_Color"]["a"])
+ rows = []
+ for n, style in (("Text 1", "MSG_NAME"), ("Text Hold", "MSG"), ("Text 2", "MSG"), ("Text 3", "MSG")):
+ q = fm(n)
+ tc, gt = comp(q, "TextContainer"), comp(q, "SetTextMeshProGameText")
+ rows.append("{%d, %s, %s}" % (texts.add(text.clean(sh[gt["sheetName"]][gt["convName"]]), style), U(q["pos"][0]),
+ U(q["pos"][1] + (1 - tc["m_pivot"]["y"]) * tc["m_rect"]["height"] * q["lscale"][1])))
+ out["FIRSTMAP_TEXTS"] = "{%s}" % ", ".join(rows)
+ parts = []
+ for n in ("Map_prompt", "Inv_0017_divider", "Stop"):
+ q = fm(n)
+ kx, ky = q["lscale"][0], q["lscale"][1]
+ parts.append("{%d, %s, %s, %s, %s}" % (sprites.id(h, comp(q, "SpriteRenderer")["m_Sprite"], max(kx, ky), res),
+ U(q["pos"][0]), U(q["pos"][1]), U(kx / max(kx, ky)), U(ky / max(kx, ky))))
+ out["FIRSTMAP_PIECES"] = "{%s}" % ", ".join(parts)
+ out["FIRSTMAP_KEY"] = "{%d, %s, %s}" % (texts.add("var", "PROMPT"), U(fm("Button")["pos"][0]), U(fm("Button")["pos"][1]))
+ return out
diff --git a/games/hollowknight/tools/pack.py b/games/hollowknight/tools/pack.py
index aa38f111..7f304181 100644
--- a/games/hollowknight/tools/pack.py
+++ b/games/hollowknight/tools/pack.py
@@ -567,6 +567,9 @@ def main():
fleurs.update(shop.build(SPRITES, TEXTS, hud_res, actors.clip_id, vm.CHARMS))
fleurs.update(collect.build())
fleurs.update(stag.build(SPRITES, TEXTS, hud_res, actors.clip_id, ents.pd_flags(), vm.STR.id, ROOMS))
+ import gamemap
+ fleurs.update(gamemap.build(SPRITES, TEXTS, hud_res, ROOMS, ents.pd_flags(),
+ lambda r: scene.settings(unity.scene(r)).get("map_zone") or 0))
fleurs["ROOM_ZONES"] = "{%s}" % ", ".join(str(scene.settings(unity.scene(r)).get("map_zone") or 0) for r in ROOMS)
for i, item in enumerate(text.MSGS):
fleurs["MSG_" + item] = i
diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.py
index d3156bfc..d0dc06eb 100644
--- a/games/hollowknight/tools/vm.py
+++ b/games/hollowknight/tools/vm.py
@@ -55,7 +55,7 @@ ROOMS = {
"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"],
+ "Crossroads_33": ["_Props/full_wall_left", "Cornifer", "Cornifer Card"],
"Fungus1_32": ["Breakable Wall", "Inspect Region"],
"Crossroads_11_alt": ["Inspect Region"],
}
@@ -174,6 +174,9 @@ PD_CONST = {"openedTown": True, "kingsStationNonDisplay": False, "queensStationN
"gotSlyCharm": False, "hasAllNailArts": False, "hasNailArt": False, "honedNail": False,
"iseldaConvoGrimm": False, "iseldaNymmConvo": False, "slyConvoGrimm": False, "slyNymmConvo": False,
"slyConvoNailArt": False, "slyConvoNailHoned": False, "backerCredits": False, "finalGrubRewardCollected": False, "gaveSlykey": False, "hasSlykey": False,
+ "corn_greenpathEncountered": False, "corn_fogCanyonEncountered": False,
+ "corn_fungalWastesEncountered": False, "corn_cityEncountered": False, "corn_waterwaysEncountered": False,
+ "corn_minesEncountered": False, "corn_deepnestEncountered": False, "corn_cliffsEncountered": False,
"corn_fogCanyonLeft": False, "corn_fungalWastesLeft": False, "corn_cityLeft": False,
"corn_waterwaysLeft": False, "corn_minesLeft": False, "corn_cliffsLeft": False, "corn_deepnestLeft": False,
"corn_outskirtsLeft": False, "corn_royalGardensLeft": False, "corn_abyssLeft": False,
@@ -215,7 +218,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", "HIT", "UNCOVER", "UP", "DOWN"):
+ "YES", "NO", "CONTINUE", "RESET", "HIT", "UNCOVER", "UP", "DOWN", "FIRST MAP UP", "FIRST MAP DOWN"):
EVENTS.id(e)
FIXED_EVENTS = len(EVENTS.list) # (src/data.h: VMEV_*)
@@ -390,6 +393,12 @@ op("BoolNoneTrue", ("boolVariables", "b*"), ("sendEvent", "e"), ("storeResult",
op("DialoguePlace", ("which", "n"), ("y", "f"))
op("StopPause", ("time", "f"))
op("GetFsmBool", ("gameObject", "o"), ("fsmName", "s"), ("slot", "n"), ("storeValue", "B"), ("everyFrame", "n"))
+op("ConvertIntToFloat", ("intVariable", "i"), ("floatVariable", "F"), ("everyFrame", "n"))
+op("ConvertFloatToInt", ("floatVariable", "f"), ("intVariable", "I"), ("rounding", "n"), ("everyFrame", "n"))
+op("SendEventByScale", ("gameObject", "o"), ("positiveEvent", "e"), ("negativeEvent", "e")) # (its x scale's sign)
+op("ListenForQuickMap", ("wasPressed", "e"))
+op("MapUpdateMsg") # (Map Update Msg: src/map.c's)
+op("UpdateGameMap", ("store", "B")) # (GameManager.UpdateGameMap: any room newly mapped)
# HeroController's methods the scripts call (HeroCall's method)
HERO_METHODS = ["RelinquishControl", "RegainControl", "StopAnimationControl", "StartAnimationControl", "FaceLeft",
@@ -410,6 +419,8 @@ PREFAB_SPAWNS = {("sharedassets76.assets", 69), ("sharedassets133.assets", 23),
# prefabs the pool gives (SpawnObjectFromGlobalPool) that the scripts show (made beforehand, off)
POOL_SPAWNS = {("resources.assets", 5267)}
# the notices' prefabs (made by the C code: msg.c): a relic's, a charm's, the charm tutorial
+MAP_GET_MSG = ("sharedassets64.assets", 18) # (Map Get Msg: a relic's notice, as msg.c shows it)
+MAP_UPDATE_MSG = ("sharedassets7.assets", 539) # (Map Update Msg: src/map.c's)
NOTICE_PREFABS = {("resources.assets", 4251): "relic", ("sharedassets6.assets", 446): "charm",
("sharedassets6.assets", 491): "tute"}
# the icons the scripts set on a notice (SetSpriteRendererSprite): (scene or prefab document, sprite ref), as NoticeIcon
@@ -1004,7 +1015,10 @@ class Compiler:
# (a price: kept for ConvertStringToInt)
import text
keys = self.string_values(P.get("convName"))
- assert len(keys) == 1 and keys[0] in text.sheets()["Prices"], keys
+ keys = [k for k in keys if k in text.sheets()["Prices"]] # (a key built from parts: the one it can be)
+ if len(keys) != 1:
+ self.problem("price %r" % keys)
+ return None
self.prices[P.get("storeValue")] = int(text.sheets()["Prices"][keys[0]])
return None
if n == "ConvertStringToInt" and P.get("stringVariable") in self.prices:
@@ -1026,6 +1040,14 @@ class Compiler:
return None # (its prompt's label: kept for UP)
if n == "SpawnObjectFromGlobalPool" and self.prompt and P.get("storeObject") == self.prompt[1]:
return None
+ if n == "SetFsmString" and P.get("fsmName") == "Map Msg" and P.get("variableName") == "Convo":
+ # (a map's notice: its name, the UI sheet's)
+ import text
+ keys = [k for k in self.string_values(P.get("setValue")) if k in text.sheets()["UI"]]
+ if len(keys) != 1:
+ self.problem("map notice %r" % keys)
+ return None
+ return self.emit("NoticeText", {"text": self.rm.texts.add(text.clean(text.sheets()["UI"][keys[0]]), "NOTICE")})
if n == "SetFsmString" and P.get("fsmName") == "Msg Control" and P.get("variableName") == "Item":
if P.get("setValue") not in MSG_ITEMS:
self.problem("item message %s" % P.get("setValue"))
@@ -1178,6 +1200,18 @@ class Compiler:
obj = self.rm.add_prefab(f, pid, (self.o["id"], self.where, P.get("storeObject")))
return self.emit("CreateObject", {"gameObject": ("objindex", obj), "x": pos[0], "y": pos[1],
"storeObject": P.get("storeObject")})
+ if (f, pid) == MAP_UPDATE_MSG:
+ return self.emit("MapUpdateMsg", {})
+ if (f, pid) == MAP_GET_MSG:
+ # (a map's notice, as a relic's: its own icon; its text below, by its Convo)
+ q = next(z for z in d2["objects"] if z["name"] == "Icon")
+ ref = next(c["v"]["m_Sprite"] for c in q["c"] if c["type"] == "SpriteRenderer")
+ key = (d2, (ref[0], ref[1]))
+ k = next((i for i, (dd, rr) in enumerate(NOTICE_ICONS) if dd is key[0] and rr == key[1]), None)
+ if k is None:
+ k = len(NOTICE_ICONS)
+ NOTICE_ICONS.append(key)
+ return self.emit("NoticeIcon", {"icon": k})
if NOTICE_PREFABS.get((f, pid)) == "tute":
# (the charm tutorial: the C code's, as an object the scripts close)
return self.emit("CharmTute", {}) + self.emit("SetGameObject", {
@@ -1228,8 +1262,12 @@ class Compiler:
assert len(body) < 256, rows
return bytes([OPS["StartConversationOf"][0], len(body)]) + body
if beh == "GameManager" and m in ("CheckCharmAchievements", "AwardAchievement", "CheckStagStationAchievements",
- "SaveLevelState"):
+ "SaveLevelState", "CheckMapAchievement"):
return None
+ if beh == "GameManager" and m == "UpdateGameMap":
+ return self.emit("UpdateGameMap", {"store": P.get("storeResult")})
+ if beh == "GameMap" and m == "SetupMap":
+ return None # (the map: drawn as PlayerData has it, src/map.c)
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:
@@ -1252,7 +1290,7 @@ class Compiler:
return None
if fn in ("advanceTypewriter", "TimePasses", "StoryRecord_acquired", "StoryRecord_visited", "SetActionString",
"RefreshButtonIcon", "StopBounce", "CheckGrubAchievements", "AddToGrubList", "CountCharms",
- "TriggerStartVideo"):
+ "TriggerStartVideo", "CheckAllMaps"):
return None
self.problem("SendMessage %s" % fn)
return None
@@ -1360,7 +1398,7 @@ class Compiler:
return None
return self.emit(n, dict(P, perSecond=1 if P.get("perSecond") else 0))
if n in ("ListenForUp", "ListenForDown", "ListenForLeft", "ListenForRight", "ListenForAttack", "ListenForJump",
- "ListenForCast", "ListenForInventory"):
+ "ListenForCast", "ListenForInventory", "ListenForQuickMap"):
if P.get("eventTarget") not in (None, "Self"):
self.problem("%s to another" % n)
return self.emit(n, P)
@@ -1969,6 +2007,8 @@ def reachable(f, external=()):
seen.add(n)
s = by[n]
can, sure = _events_of_state(f, s, consts)
+ if any(dict(a["params"]).get("gameObject") == "$DialogueTextYN" for a in s["actions"]):
+ can = set(can) | {"YES", "NO"} # (the yes or no box's answer, to who asked)
for e, to in s["transitions"]:
if e in can or (e not in local and not (sure and e == "FINISHED")):
todo.append(to)