Free games for graphing calculators: NumWorks, TI-Nspire CX, Casio fx-CG50 and soon TI-84 Plus CE. Balatro, Celeste, Hollow Knight, Minecraft and more.
C calculatorcalculator-gamescasiochesscrossy-roaddrive-madfx-cg50gamesgeometry-dashgraphing-calculatorndlessnumworksnumworks-appsnumworks-calculatornumworks-gamenumworks-gamestetristi-84-plus-ceti-nspire
Hollow Knight: the Mantis Claw, its wall jump in both apps, Mark of Pride's slashes
Mason36304d086427676
diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.binindex d7ba43d3..1558f18a 100644Binary files a/games/hollowknight/src/data.bin and b/games/hollowknight/src/data.bin differdiff --git a/games/hollowknight/src/data.h b/games/hollowknight/src/data.hindex 1081fa40..173b538c 100644--- a/games/hollowknight/src/data.h+++ b/games/hollowknight/src/data.h@@ -83,603 +83,611 @@#define CLIP_KNIGHT_DOWNSLASH 18#define CLIP_KNIGHT_DOWNSLASHEFFECT 19#define CLIP_KNIGHT_DOWNSLASHEFFECT_F 20-#define CLIP_KNIGHT_DREAMER_LAND 21-#define CLIP_KNIGHT_ENTER 22-#define CLIP_KNIGHT_EXIT 23-#define CLIP_KNIGHT_EXIT_DOOR_TO_IDLE 24-#define CLIP_KNIGHT_FALL 25-#define CLIP_KNIGHT_FIREBALL_ANTIC 26-#define CLIP_KNIGHT_FIREBALL1_CAST 27-#define CLIP_KNIGHT_FOCUS 28-#define CLIP_KNIGHT_FOCUS_END 29-#define CLIP_KNIGHT_FOCUS_GET 30-#define CLIP_KNIGHT_FOCUS_GET_ONCE 31-#define CLIP_KNIGHT_GET_OFF 32-#define CLIP_KNIGHT_GETUPTOIDLE 33-#define CLIP_KNIGHT_HARDLAND 34-#define CLIP_KNIGHT_HAZARD_RESPAWN 35-#define CLIP_KNIGHT_IDLE 36-#define CLIP_KNIGHT_IDLE_HURT 37-#define CLIP_KNIGHT_IDLE_WIND 38-#define CLIP_KNIGHT_LAND 39-#define CLIP_KNIGHT_LOOKDOWN 40-#define CLIP_KNIGHT_LOOKDOWNEND 41-#define CLIP_KNIGHT_LOOKDOWNTOIDLE 42-#define CLIP_KNIGHT_LOOKUP 43-#define CLIP_KNIGHT_LOOKUPEND 44-#define CLIP_KNIGHT_LOOKUPTOIDLE 45-#define CLIP_KNIGHT_MAP_AWAY 46-#define CLIP_KNIGHT_MAP_IDLE 47-#define CLIP_KNIGHT_MAP_OPEN 48-#define CLIP_KNIGHT_MAP_TURN 49-#define CLIP_KNIGHT_MAP_UPDATE 50-#define CLIP_KNIGHT_MAP_WALK 51-#define CLIP_KNIGHT_PROSTRATE 52-#define CLIP_KNIGHT_PROSTRATE_RISE 53-#define CLIP_KNIGHT_RECOIL 54-#define CLIP_KNIGHT_RESPAWN_WAKE 55-#define CLIP_KNIGHT_ROAR_LOCK 56-#define CLIP_KNIGHT_RUN 57-#define CLIP_KNIGHT_RUN_TO_IDLE 58-#define CLIP_KNIGHT_SIT 59-#define CLIP_KNIGHT_SIT_FALL_ASLEEP 60-#define CLIP_KNIGHT_SIT_IDLE 61-#define CLIP_KNIGHT_SIT_LEAN 62-#define CLIP_KNIGHT_SIT_MAP_CLOSE 63-#define CLIP_KNIGHT_SIT_MAP_OPEN 64-#define CLIP_KNIGHT_SITTING_ASLEEP 65-#define CLIP_KNIGHT_SLASH 66-#define CLIP_KNIGHT_SLASHALT 67-#define CLIP_KNIGHT_SLASHEFFECT 68-#define CLIP_KNIGHT_SLASHEFFECT_F 69-#define CLIP_KNIGHT_SLASHEFFECTALT 70-#define CLIP_KNIGHT_SLASHEFFECTALT_F 71-#define CLIP_KNIGHT_SPIKE_DEATH 72-#define CLIP_KNIGHT_SPIKE_DEATH_ANTIC 73-#define CLIP_KNIGHT_STUN 74-#define CLIP_KNIGHT_SUPER_HARD_LAND 75-#define CLIP_KNIGHT_TURN 76-#define CLIP_KNIGHT_TURNFROMBG 77-#define CLIP_KNIGHT_TURNTOBG 78-#define CLIP_KNIGHT_TURNTOIDLE 79-#define CLIP_KNIGHT_UPSLASH 80-#define CLIP_KNIGHT_UPSLASHEFFECT 81-#define CLIP_KNIGHT_UPSLASHEFFECT_F 82-#define CLIP_KNIGHT_WAKE 83-#define CLIP_KNIGHT_WAKE_TO_SIT 84-#define CLIP_KNIGHT_WAKE_UP_GROUND 85-#define CLIP_KNIGHT_WALK 86-#define CLIP_GEOROCK_IDLE_1 87-#define CLIP_GEOROCK_GLEAM_1 88-#define CLIP_GEOROCK_BROKEN_1 89-#define CLIP_GEOROCK_IDLE_2 90-#define CLIP_GEOROCK_GLEAM_2 91-#define CLIP_GEOROCK_BROKEN_2 92-#define CLIP_CHEST_IDLE 93-#define CLIP_CHEST_OPEN 94-#define CLIP_CHEST_BURST 95-#define CLIP_CHEST_OPENED 96-#define CLIP_HUD_HEALTH_EMPTY 97-#define CLIP_HUD_HEALTH_IDLE 98-#define CLIP_HUD_HEALTH_BREAK 99-#define CLIP_HUD_HEALTH_REFILL 100-#define CLIP_HUD_HEALTH_APPEAR 101-#define CLIP_HUD_BLUE_APPEAR 102-#define CLIP_HUD_BLUE_IDLE 103-#define CLIP_HUD_BLUE_BREAK 104-#define CLIP_HUD_BLUE_BREAK_FAST 105-#define CLIP_HUD_HUD_FRAME 106-#define CLIP_HUD_HUD_FRAME_IDLE 107-#define CLIP_HUD_HUD_FRAME_CRACKAPPEAR 108-#define CLIP_HUD_HUD_FRAME_CRACKED 109-#define CLIP_HUD_COIN_APPEAR 110-#define CLIP_HUD_COIN_IDLE 111-#define CLIP_HUD_COIN_GET 112-#define CLIP_HUD_SOUL_BURST 113-#define CLIP_LIQUID_FILL 114-#define CLIP_LIQUID_IDLE 115-#define CLIP_LIQUID_SHRINK 116-#define CLIP_LIQUID_DRAIN 117-#define CLIP_GEO_SMALL_IDLE 118-#define CLIP_GEO_SMALL_AIR 119-#define CLIP_GEO_MED_IDLE 120-#define CLIP_GEO_MED_AIR 121-#define CLIP_GEO_LARGE_IDLE 122-#define CLIP_GEO_LARGE_AIR 123-#define CLIP_SHOPUI_SHOP_MENU_TOP_UP 124-#define CLIP_SHOPUI_SHOP_MENU_TOP_DOWN 125-#define CLIP_SHOPUI_SHOP_MENU_BOTTOM_UP 126-#define CLIP_SHOPUI_SHOP_MENU_BOTTOM_DOWN 127-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_UP 128-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_DOWN 129-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_UP 130-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_DOWN 131-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_UP 132-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_DOWN 133-#define CLIP_HEARTUI_FLEUR_APPEAR 134-#define CLIP_HEARTUI_FLEUR_DISAPPEAR 135-#define CLIP_HEARTUI_GET_0 136-#define CLIP_HEARTUI_GET_1 137-#define CLIP_HEARTUI_GET_2 138-#define CLIP_HEARTUI_GET_3 139-#define CLIP_HEARTUI_GET_4 140-#define CLIP_HEARTUI_GOT_1 141-#define CLIP_HEARTUI_GOT_2 142-#define CLIP_HEARTUI_GOT_3 143-#define CLIP_HEARTUI_FUSE 144-#define CLIP_HEARTUI_HEAD_MOVE 145-#define CLIP_VESSELUI_GET_0 146-#define CLIP_VESSELUI_GET_1 147-#define CLIP_VESSELUI_GET_2 148-#define CLIP_VESSELUI_GET_3 149-#define CLIP_VESSELUI_GOT_1 150-#define CLIP_VESSELUI_GOT_2 151-#define CLIP_STAGUI_STAG_MAP_SELECTION_CURSOR 152-#define CLIP_STAGUI_STAG_BORDER_TOP_UP 153-#define CLIP_STAGUI_STAG_BORDER_TOP_DOWN 154-#define CLIP_STAGUI_STAG_BORDER_BOTTOM_UP 155-#define CLIP_STAGUI_STAG_BORDER_BOTTOM_DOWN 156-#define CLIP_MAPUI_IDLE 157-#define CLIP_MAPUI_WALK 158-#define CLIP_JOURNALMSG_MAP_WRITING 159-#define CLIP_JOURNALMSG_MAP_COMPLETE 160-#define CLIP_GEOBUG_LAMP_BUG_IDLE 161-#define CLIP_DIALOGUE_ARROW_UP 162-#define CLIP_DIALOGUE_ARROW_DOWN 163-#define CLIP_DIALOGUE_STOP_UP 164-#define CLIP_DIALOGUE_STOP_DOWN 165-#define CLIP_DIALOGUE_FLEUR_TOP_UP 166-#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 167-#define CLIP_DIALOGUE_FLEUR_BOT_UP 168-#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 169-#define CLIP_DIALOGUE_DREAM_UP 170-#define CLIP_DIALOGUE_DREAM_DOWN 171-#define CLIP_PROMPT_BLANK 172-#define CLIP_PROMPT_DOWN 173-#define CLIP_PROMPT_ENTER_DOWN 174-#define CLIP_PROMPT_ENTER_IDLE 175-#define CLIP_PROMPT_ENTER_UP 176-#define CLIP_PROMPT_IDLE 177-#define CLIP_PROMPT_LISTEN_DOWN 178-#define CLIP_PROMPT_LISTEN_IDLE 179-#define CLIP_PROMPT_LISTEN_UP 180-#define CLIP_PROMPT_UP 181-#define CLIP_SHADE_APPEAR 182-#define CLIP_SHADE_CAST 183-#define CLIP_SHADE_CAST_ANTIC 184-#define CLIP_SHADE_CAST_CHARGE 185-#define CLIP_SHADE_CAST_RING 186-#define CLIP_SHADE_DEATH 187-#define CLIP_SHADE_DEATH_GLOW 188-#define CLIP_SHADE_DEATH_START 189-#define CLIP_SHADE_DEPART 190-#define CLIP_SHADE_FIREBALL 191-#define CLIP_SHADE_FIREBALL_END 192-#define CLIP_SHADE_FLY 193-#define CLIP_SHADE_IDLE 194-#define CLIP_SHADE_RETREAT_END 195-#define CLIP_SHADE_RETREAT_START 196-#define CLIP_SHADE_SLASH 197-#define CLIP_SHADE_SLASH_ANTIC 198-#define CLIP_SHADE_SLASH_CD 199-#define CLIP_SHADE_SLASH_EFFECT 200-#define CLIP_SHADE_STARTLE 201-#define CLIP_SHADE_TURNTOFLY 202-#define CLIP_SHADE_TURNTOIDLE 203-#define CLIP_CRAWLER_WALK 204-#define CLIP_CRAWLER_TURN 205-#define CLIP_CRAWLER_IDLE 206-#define CLIP_CRAWLER_DEATH_AIR 207-#define CLIP_CRAWLER_DEATH_LAND 208-#define CLIP_BUZZER_CHASE 209-#define CLIP_BUZZER_IDLE 210-#define CLIP_BUZZER_STARTLE 211-#define CLIP_BUZZER_DEATH_AIR 212-#define CLIP_BUZZER_DEATH_LAND 213-#define CLIP_BUZZER_FLY 214-#define CLIP_BUZZER_TURNTOFLY 215-#define CLIP_BUZZER_TURNTOIDLE 216-#define CLIP_TIKTIK_DEATH_AIR 217-#define CLIP_TIKTIK_DEATH_LAND 218-#define CLIP_TIKTIK_STUN 219-#define CLIP_TIKTIK_WALK 220-#define CLIP_GRUZZER_DEATH_AIR 221-#define CLIP_GRUZZER_DEATH_LAND 222-#define CLIP_GRUZZER_FLY 223-#define CLIP_ASPID_DEATH_AIR 224-#define CLIP_ASPID_FIRE_LONG 225-#define CLIP_ASPID_FLY 226-#define CLIP_ASPID_TURNTOFLY 227-#define CLIP_BALDUR_DEATH_AIR 228-#define CLIP_BALDUR_DEATH_LAND 229-#define CLIP_BALDUR_IDLE 230-#define CLIP_BALDUR_ROLL 231-#define CLIP_BALDUR_START 232-#define CLIP_BALDUR_STOP 233-#define CLIP_ELDERBALDUR_CLOSE1 234-#define CLIP_ELDERBALDUR_CLOSE2 235-#define CLIP_ELDERBALDUR_CLOSED 236-#define CLIP_ELDERBALDUR_DEATH 237-#define CLIP_ELDERBALDUR_DEATH_STUN 238-#define CLIP_ELDERBALDUR_HIT 239-#define CLIP_ELDERBALDUR_IDLE 240-#define CLIP_ELDERBALDUR_OPEN 241-#define CLIP_ELDERBALDUR_SHOOT_ANTIC 242-#define CLIP_ELDERBALDUR_SHOOT_CD 243-#define CLIP_HUSK_ATTACK_ANTICIPATE 244-#define CLIP_HUSK_ATTACK_COOLDOWN 245-#define CLIP_HUSK_ATTACK_LUNGE 246-#define CLIP_HUSK_DEATH_AIR 247-#define CLIP_HUSK_DEATH_LAND 248-#define CLIP_HUSK_IDLE 249-#define CLIP_HUSK_TURN 250-#define CLIP_HUSK_WALK 251-#define CLIP_BARGER_ATTACK_ANTICIPATE 252-#define CLIP_BARGER_ATTACK_COOLDOWN 253-#define CLIP_BARGER_ATTACK_LUNGE 254-#define CLIP_BARGER_DEATH_AIR 255-#define CLIP_BARGER_DEATH_LAND 256-#define CLIP_BARGER_IDLE 257-#define CLIP_BARGER_TURN 258-#define CLIP_BARGER_WALK 259-#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 260-#define CLIP_HORNHEAD_ATTACK_COOLDOWN 261-#define CLIP_HORNHEAD_ATTACK_LUNGE 262-#define CLIP_HORNHEAD_DEATH_AIR 263-#define CLIP_HORNHEAD_DEATH_LAND 264-#define CLIP_HORNHEAD_IDLE 265-#define CLIP_HORNHEAD_TURN 266-#define CLIP_HORNHEAD_WALK 267-#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 268-#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 269-#define CLIP_MOSSRUNNER_ATTACK_LUNGE 270-#define CLIP_MOSSRUNNER_DEATH_AIR 271-#define CLIP_MOSSRUNNER_DEATH_LAND 272-#define CLIP_MOSSRUNNER_IDLE 273-#define CLIP_MOSSRUNNER_TURN 274-#define CLIP_MOSSRUNNER_WALK 275-#define CLIP_LEAPER_ATTACK 276-#define CLIP_LEAPER_DEATH_AIR 277-#define CLIP_LEAPER_DEATH_LAND 278-#define CLIP_LEAPER_IDLE 279-#define CLIP_LEAPER_LAND 280-#define CLIP_LEAPER_TURN 281-#define CLIP_LEAPER_WALK 282-#define CLIP_GUARD_ANTICIPATE 283-#define CLIP_GUARD_ATTACK2 284-#define CLIP_GUARD_DEATH_AIR 285-#define CLIP_GUARD_DEATH_LAND 286-#define CLIP_GUARD_DORMANT 287-#define CLIP_GUARD_IDLE 288-#define CLIP_GUARD_RUN 289-#define CLIP_GUARD_STARTLE 290-#define CLIP_GUARD_STOMP_ANTIC 291-#define CLIP_GUARD_STOMP_JUMP 292-#define CLIP_GUARD_STOMP_LAND 293-#define CLIP_GUARD_STOP_RUN 294-#define CLIP_GUARD_STOP_WALK 295-#define CLIP_GUARD_SWIPE 296-#define CLIP_GUARD_TURN 297-#define CLIP_GUARD_WAKE 298-#define CLIP_GUARD_WALK 299-#define CLIP_FK_ATTACK 300-#define CLIP_FK_ATTACK_ANTIC 301-#define CLIP_FK_ATTACK_RECOVER 302-#define CLIP_FK_BLANK 303-#define CLIP_FK_BODY 304-#define CLIP_FK_DEATH_FALL 305-#define CLIP_FK_DEATH_HEAD_1 306-#define CLIP_FK_DEATH_HEAD_2 307-#define CLIP_FK_DEATH_LAND 308-#define CLIP_FK_DEATH_SPAZ 309-#define CLIP_FK_IDLE 310-#define CLIP_FK_JUMP 311-#define CLIP_FK_JUMP_ANTIC 312-#define CLIP_FK_JUMP_ATTACK_HIT_1 313-#define CLIP_FK_JUMP_ATTACK_HIT_2 314-#define CLIP_FK_JUMP_ATTACK_HIT_3 315-#define CLIP_FK_JUMP_ATTACK_UP 316-#define CLIP_FK_LAND 317-#define CLIP_FK_RAGE 318-#define CLIP_FK_RUN 319-#define CLIP_FK_RUN_ANTIC 320-#define CLIP_FK_STUN_HIT 321-#define CLIP_FK_STUN_OPEN 322-#define CLIP_FK_STUN_OPENED 323-#define CLIP_FK_STUN_RECOVER 324-#define CLIP_FK_STUN_ROLL 325-#define CLIP_FK_STUN_ROLL_END 326-#define CLIP_FK_TURN 327-#define CLIP_FKHEAD_DEATH_LAND 328-#define CLIP_FKHEAD_HEAD_HIT 329-#define CLIP_FKHEAD_HEAD_IDLE 330-#define CLIP_FKHEAD_HEAD_SPAZ 331-#define CLIP_HATCHER_DEATH_AIR 332-#define CLIP_HATCHER_DEATH_LAND 333-#define CLIP_HATCHER_FIRE 334-#define CLIP_HATCHER_FLY 335-#define CLIP_HATCHLING_FLY 336-#define CLIP_SLUG_BOUNCE 337-#define CLIP_SLUG_DEATH_AIR 338-#define CLIP_SLUG_DEATH_LAND 339-#define CLIP_SLUG_IDLE_TODOWN 340-#define CLIP_SLUG_IDLE_TOUP 341-#define CLIP_SLUG_IDLE_UP 342-#define CLIP_SLUG_RUN 343-#define CLIP_SLUG_STARTLE 344-#define CLIP_GFLY_BURST 345-#define CLIP_GFLY_CHARGE 346-#define CLIP_GFLY_CHARGE_ANTIC 347-#define CLIP_GFLY_CHARGE_RECOVER 348-#define CLIP_GFLY_DEATH 349-#define CLIP_GFLY_FALL 350-#define CLIP_GFLY_FLY 351-#define CLIP_GFLY_GURGLE_LOOP 352-#define CLIP_GFLY_GURGLE_ONCE 353-#define CLIP_GFLY_SLAM_DOWN 354-#define CLIP_GFLY_SLAM_END 355-#define CLIP_GFLY_SLAM_UP 356-#define CLIP_GFLY_SLEEP 357-#define CLIP_GFLY_STOP 358-#define CLIP_GFLY_WAKE 359-#define CLIP_GFLY_WIGGLE 360-#define CLIP_MOSSWALKER_APPEAR 361-#define CLIP_MOSSWALKER_BURY 362-#define CLIP_MOSSWALKER_DEATH_AIR 363-#define CLIP_MOSSWALKER_DEATH_LAND 364-#define CLIP_MOSSWALKER_SHAKE 365-#define CLIP_MOSSWALKER_TURN 366-#define CLIP_MOSSWALKER_WALK 367-#define CLIP_PIGEON_FLY 368-#define CLIP_PIGEON_IDLE_01 369-#define CLIP_PIGEON_IDLE_02 370-#define CLIP_PIGEON_IDLE_03 371-#define CLIP_PLANTTRAP_DEATH 372-#define CLIP_PLANTTRAP_IDLE 373-#define CLIP_PLANTTRAP_RETRACT 374-#define CLIP_PLANTTRAP_SNAP 375-#define CLIP_PLANTTRAP_SNAP_READY 376-#define CLIP_SHAKER_ATTACK 377-#define CLIP_SHAKER_DEATH_AIR 378-#define CLIP_SHAKER_DEATH_LAND 379-#define CLIP_SHAKER_IDLE 380-#define CLIP_SHAKER_TURN 381-#define CLIP_SHAKER_WALK 382-#define CLIP_MOSQUITO_ATTACK 383-#define CLIP_MOSQUITO_ATTACK_ANTIC 384-#define CLIP_MOSQUITO_DEATH_AIR 385-#define CLIP_MOSQUITO_DEATH_LAND 386-#define CLIP_MOSQUITO_IDLE 387-#define CLIP_MOSQUITO_STARTLE 388-#define CLIP_MOSQUITO_TURNTOIDLE 389-#define CLIP_FATFLY_ATTACK 390-#define CLIP_FATFLY_DEATH_AIR 391-#define CLIP_FATFLY_DEATH_LAND 392-#define CLIP_FATFLY_FLY 393-#define CLIP_MOSSCHARGER_APPEAR 394-#define CLIP_MOSSCHARGER_CHARGE 395-#define CLIP_MOSSCHARGER_DEATH_AIR 396-#define CLIP_MOSSCHARGER_DEATH_LAND 397-#define CLIP_MOSSCHARGER_DISAPPEAR 398-#define CLIP_MOSSCHARGER_ESCAPE 399-#define CLIP_MOSSCHARGER_GET_UP 400-#define CLIP_MOSSCHARGER_STUN 401-#define CLIP_MOSSCHARGER_TURNRUN 402-#define CLIP_MOSSKNIGHT_DEATH_AIR 403-#define CLIP_MOSSKNIGHT_DEATH_LAND 404-#define CLIP_MOSSKNIGHT_DORMANT_1 405-#define CLIP_MOSSKNIGHT_DORMANT_2 406-#define CLIP_MOSSKNIGHT_EVADE 407-#define CLIP_MOSSKNIGHT_IDLE 408-#define CLIP_MOSSKNIGHT_SHAKE 409-#define CLIP_MOSSKNIGHT_SHIELD_FRONT 410-#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 411-#define CLIP_MOSSKNIGHT_SHIELD_TOP 412-#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 413-#define CLIP_MOSSKNIGHT_SHOOT 414-#define CLIP_MOSSKNIGHT_SHOOT_END 415-#define CLIP_MOSSKNIGHT_SLASH 416-#define CLIP_MOSSKNIGHT_SLASH_2 417-#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 418-#define CLIP_MOSSKNIGHT_SLASH_EFFECT 419-#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 420-#define CLIP_MOSSKNIGHT_SLASH_END 421-#define CLIP_MOSSKNIGHT_SLASH_QUICK 422-#define CLIP_MOSSKNIGHT_TURN 423-#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 424-#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 425-#define CLIP_MOSSKNIGHT_WAKE 426-#define CLIP_MOSSKNIGHT_WALK 427-#define CLIP_HORNET_A_DASH 428-#define CLIP_HORNET_A_DASH_ANTIC 429-#define CLIP_HORNET_AIR_DASH_EFFECT 430-#define CLIP_HORNET_DEATH_AIR 431-#define CLIP_HORNET_EVADE 432-#define CLIP_HORNET_EVADE_ANTIC 433-#define CLIP_HORNET_FALL 434-#define CLIP_HORNET_FLASH 435-#define CLIP_HORNET_FLOURISH 436-#define CLIP_HORNET_G_DASH 437-#define CLIP_HORNET_G_DASH_ANTIC 438-#define CLIP_HORNET_G_DASH_EFFECT 439-#define CLIP_HORNET_G_DASH_RECOVER1 440-#define CLIP_HORNET_G_DASH_RECOVER2 441-#define CLIP_HORNET_HARD_LAND 442-#define CLIP_HORNET_IDLE 443-#define CLIP_HORNET_JUMP 444-#define CLIP_HORNET_JUMP_ANTIC 445-#define CLIP_HORNET_LAND 446-#define CLIP_HORNET_NEEDLE 447-#define CLIP_HORNET_NEEDLE_THREAD 448-#define CLIP_HORNET_RUN 449-#define CLIP_HORNET_SPHERE_ANTIC_A 450-#define CLIP_HORNET_SPHERE_ANTIC_G 451-#define CLIP_HORNET_SPHERE_ATTACK 452-#define CLIP_HORNET_SPHERE_BALL 453-#define CLIP_HORNET_SPHERE_RECOVER_A 454-#define CLIP_HORNET_SPHERE_RECOVER_G 455-#define CLIP_HORNET_STUN 456-#define CLIP_HORNET_STUN_AIR 457-#define CLIP_HORNET_THROW 458-#define CLIP_HORNET_THROW_ANTIC 459-#define CLIP_HORNET_THROW_EFFECT 460-#define CLIP_HORNET_THROW_RECOVER 461-#define CLIP_HORNET_WALL_IMPACT 462-#define CLIP_HORNET_WOUNDED 463-#define CLIP_MENDER_DEATH_AIR 464-#define CLIP_MENDER_DEATH_LAND 465-#define CLIP_MENDER_FLY 466-#define CLIP_MENDER_IDLE 467-#define CLIP_MENDER_STARTLE 468-#define CLIP_BGATE_BG_CLOSE_1 469-#define CLIP_BGATE_BG_CLOSE_2 470-#define CLIP_BGATE_BG_CLOSED 471-#define CLIP_BGATE_BG_OPEN 472-#define CLIP_BGATE_BG_OPENED 473-#define CLIP_BGATE_BONE_GATE_CLOSE 474-#define CLIP_BGATE_BONE_GATE_CLOSED 475-#define CLIP_BGATE_BONE_GATE_OPEN 476-#define CLIP_BGATE_BONE_GATE_OPENED 477-#define CLIP_BGATE_GATE_IDLE 478-#define CLIP_BGATE_GATE_OPEN 479-#define CLIP_BGATE_GATE_OPENED 480-#define CLIP_BGATE_PILLAR_IDLE 481-#define CLIP_BGATE_PILLAR_OPENED 482-#define CLIP_BGATE_SWITCH_ACTIVATED 483-#define CLIP_BGATE_SWITCH_HIT 484-#define CLIP_BGATE_SWITCH_IDLE 485-#define CLIP_BGATE_TOLL_GATE_IDLE 486-#define CLIP_BGATE_TOLL_GATE_OPEN 487-#define CLIP_COCOON_COCOON_IDLE 488-#define CLIP_COCOON_COCOON_SWEAT 489-#define CLIP_COCOON_SCUTTLER_LAND 490-#define CLIP_COCOON_SCUTTLER_RUN 491-#define CLIP_FX_SPLAT 492-#define CLIP_FX_SPLAT2 493-#define CLIP_FX_SWORD 494-#define CLIP_FIREBALL_BLAST 495-#define CLIP_FIREBALL_BALL 496-#define CLIP_FIREBALL_BALL_END 497-#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 498-#define CLIP_DRIP_IDLE 499-#define CLIP_DRIP_DRIP 500-#define CLIP_DRIP_FALL 501-#define CLIP_DRIP_IMPACT 502-#define CLIP_HORNETCS_EVADE 503-#define CLIP_HORNETCS_EVADE_ANTIC 504-#define CLIP_HORNETCS_FALL 505-#define CLIP_HORNETCS_HARPOON_SIDE 506-#define CLIP_HORNETCS_IDLE 507-#define CLIP_HORNETCS_JUMP_FULL 508-#define CLIP_HORNETCS_POINT 509-#define CLIP_HORNETCS_RUN 510-#define CLIP_HORNETCS_SOFT_LAND 511-#define CLIP_HORNETCS_THREAD_1 512-#define CLIP_HORNETCS_THROW_SIDE 513-#define CLIP_HORNETCS_THROW_SIDE_START 514-#define CLIP_HORNETCS_TURN 515-#define CLIP_HORNETCS_TURNTOIDLE 516-#define CLIP_BULLET_IDLE 517-#define CLIP_BULLET_IMPACT 518-#define CLIP_BULLET_SHOCKWAVE_SPURT 519-#define CLIP_PROP0_WATERFALL_LOOP 520-#define CLIP_PROP1_TORCH2 521-#define CLIP_PROP1_TORCH3 522-#define CLIP_VM0_FLOWER 523-#define CLIP_VM0_IDLE 524-#define CLIP_VM0_REACH 525-#define CLIP_VM0_REACH_TO_IDLE 526-#define CLIP_VM0_TALK_LEFT 527-#define CLIP_VM0_TALK_RIGHT 528-#define CLIP_VM0_TURN_LEFT 529-#define CLIP_VM0_TURN_RIGHT 530-#define CLIP_VM2_IDLE 531-#define CLIP_VM2_LOOKLEFT 532-#define CLIP_VM2_LOOKRIGHT 533-#define CLIP_VM3_IDLE 534-#define CLIP_VM3_TALK 535-#define CLIP_VM3_TALK_END 536-#define CLIP_VM4_IDLE 537-#define CLIP_VM4_LOOKLEFT 538-#define CLIP_VM4_LOOKRIGHT 539-#define CLIP_VM4_SIT 540-#define CLIP_VM4_SIT_TALK 541-#define CLIP_VM4_SIT_TALK_END 542-#define CLIP_VM5_ARRIVE 543-#define CLIP_VM5_ARRIVE_SMOKE 544-#define CLIP_VM5_IDLE 545-#define CLIP_VM6_BELL_IDLE 546-#define CLIP_VM6_BELL_RING_R 547-#define CLIP_VM6_BELL_STAND 548-#define CLIP_VM6_BELL_STAND_APPEAR 549-#define CLIP_VM6_BOX_DISAPPEAR 550-#define CLIP_VM6_BOX_DISAPPEAR_QUICK 551-#define CLIP_VM6_BOX_IDLE 552-#define CLIP_VM6_FRONT 553-#define CLIP_VM6_GRATE_DISAPPEAR 554-#define CLIP_VM6_GRATE_IDLE 555-#define CLIP_VM8_DAZED 556-#define CLIP_VM8_IDLE 557-#define CLIP_VM8_TURN_L 558-#define CLIP_VM8_TURN_R 559-#define CLIP_VM8_WAKE 560-#define CLIP_VM11_HEGEMOL_CAST 561-#define CLIP_VM11_HEGEMOL_IDLE 562-#define CLIP_VM11_LURIEN_CAST 563-#define CLIP_VM11_LURIEN_IDLE 564-#define CLIP_VM11_MONOMON_CAST 565-#define CLIP_VM11_MONOMON_IDLE 566-#define CLIP_VM12_IDLE 567-#define CLIP_VM12_SIT_IDLE 568-#define CLIP_VM12_SIT_TALK 569-#define CLIP_VM12_SIT_TALK_END 570-#define CLIP_VM12_SUMMON 571-#define CLIP_VM12_TALK 572-#define CLIP_VM12_TALK_END 573-#define CLIP_VM12_TURN 574-#define CLIP_VM14_IDLE 575-#define CLIP_VM14_LOOK_LEFT 576-#define CLIP_VM14_LOOK_RIGHT 577-#define CLIP_VM14_TALK_CONVO_END 578-#define CLIP_VM14_TALK_CONVO_START 579-#define CLIP_VM14_TALK_SHOP_END 580-#define CLIP_VM14_TALK_SHOP_START 581-#define CLIP_VM15_IDLE 582-#define CLIP_VM15_SHOP_END 583-#define CLIP_VM15_SHOP_START 584-#define CLIP_VM15_TALK_END 585-#define CLIP_VM15_TALK_START 586-#define CLIP_VM16_CRY 587-#define CLIP_VM16_CRY_TURN 588-#define CLIP_VM16_FREED 589-#define CLIP_VM16_HOME_BOUNCE 590-#define CLIP_VM16_HOME_WAVE 591-#define CLIP_VM16_IDLE 592-#define CLIP_VM17_CRUMBLE 593-#define CLIP_VM17_IDLE 594-#define CLIP_VM18_BECKON 595-#define CLIP_VM18_CHEER 596-#define CLIP_VM18_CRY 597-#define CLIP_VM18_GIFT 598-#define CLIP_VM18_IDLE 599-#define CLIP_VM20_RIPPLE_WATER 600-#define CLIP_VM21_IDLE 601-#define CLIP_VM21_TALK_L 602-#define CLIP_VM21_TALK_L_END 603-#define CLIP_VM21_TALK_R 604-#define CLIP_VM21_TALK_R_END 605-#define CLIP_ANIM0_STAG_DOOR_OPEN00 606-#define CLIP_ANIM1_DASH_CLOAK_CORPSE000 607-#define CLIP_ANIM2_GROUND_PLINK_0 608-#define CLIP_ANIM3_FIREBALL_COLLECT_ANIM 609-#define CLIP_ANIM4_DOOR_OPEN00 610-#define SPRITE_HERO_LIGHT 2868-#define SPRITE_DIALOGUE_BACKBOARD 2869-#define SPRITE_PROMPT_SHADOW 2870-#define SPRITE_CORPSE_NAIL 2871-#define SPRITE_FK_BARREL 2872-#define SPRITE_FK_STAFF 2873-#define SPRITE_DIGIT0 3440+#define CLIP_KNIGHT_DOWNSLASHEFFECT_M 21+#define CLIP_KNIGHT_DREAMER_LAND 22+#define CLIP_KNIGHT_ENTER 23+#define CLIP_KNIGHT_EXIT 24+#define CLIP_KNIGHT_EXIT_DOOR_TO_IDLE 25+#define CLIP_KNIGHT_FALL 26+#define CLIP_KNIGHT_FIREBALL_ANTIC 27+#define CLIP_KNIGHT_FIREBALL1_CAST 28+#define CLIP_KNIGHT_FOCUS 29+#define CLIP_KNIGHT_FOCUS_END 30+#define CLIP_KNIGHT_FOCUS_GET 31+#define CLIP_KNIGHT_FOCUS_GET_ONCE 32+#define CLIP_KNIGHT_GET_OFF 33+#define CLIP_KNIGHT_GETUPTOIDLE 34+#define CLIP_KNIGHT_HARDLAND 35+#define CLIP_KNIGHT_HAZARD_RESPAWN 36+#define CLIP_KNIGHT_IDLE 37+#define CLIP_KNIGHT_IDLE_HURT 38+#define CLIP_KNIGHT_IDLE_WIND 39+#define CLIP_KNIGHT_LAND 40+#define CLIP_KNIGHT_LOOKDOWN 41+#define CLIP_KNIGHT_LOOKDOWNEND 42+#define CLIP_KNIGHT_LOOKDOWNTOIDLE 43+#define CLIP_KNIGHT_LOOKUP 44+#define CLIP_KNIGHT_LOOKUPEND 45+#define CLIP_KNIGHT_LOOKUPTOIDLE 46+#define CLIP_KNIGHT_MAP_AWAY 47+#define CLIP_KNIGHT_MAP_IDLE 48+#define CLIP_KNIGHT_MAP_OPEN 49+#define CLIP_KNIGHT_MAP_TURN 50+#define CLIP_KNIGHT_MAP_UPDATE 51+#define CLIP_KNIGHT_MAP_WALK 52+#define CLIP_KNIGHT_PROSTRATE 53+#define CLIP_KNIGHT_PROSTRATE_RISE 54+#define CLIP_KNIGHT_RECOIL 55+#define CLIP_KNIGHT_RESPAWN_WAKE 56+#define CLIP_KNIGHT_ROAR_LOCK 57+#define CLIP_KNIGHT_RUN 58+#define CLIP_KNIGHT_RUN_TO_IDLE 59+#define CLIP_KNIGHT_SIT 60+#define CLIP_KNIGHT_SIT_FALL_ASLEEP 61+#define CLIP_KNIGHT_SIT_IDLE 62+#define CLIP_KNIGHT_SIT_LEAN 63+#define CLIP_KNIGHT_SIT_MAP_CLOSE 64+#define CLIP_KNIGHT_SIT_MAP_OPEN 65+#define CLIP_KNIGHT_SITTING_ASLEEP 66+#define CLIP_KNIGHT_SLASH 67+#define CLIP_KNIGHT_SLASHALT 68+#define CLIP_KNIGHT_SLASHEFFECT 69+#define CLIP_KNIGHT_SLASHEFFECT_F 70+#define CLIP_KNIGHT_SLASHEFFECT_M 71+#define CLIP_KNIGHT_SLASHEFFECTALT 72+#define CLIP_KNIGHT_SLASHEFFECTALT_F 73+#define CLIP_KNIGHT_SLASHEFFECTALT_M 74+#define CLIP_KNIGHT_SPIKE_DEATH 75+#define CLIP_KNIGHT_SPIKE_DEATH_ANTIC 76+#define CLIP_KNIGHT_STUN 77+#define CLIP_KNIGHT_SUPER_HARD_LAND 78+#define CLIP_KNIGHT_TURN 79+#define CLIP_KNIGHT_TURNFROMBG 80+#define CLIP_KNIGHT_TURNTOBG 81+#define CLIP_KNIGHT_TURNTOIDLE 82+#define CLIP_KNIGHT_UPSLASH 83+#define CLIP_KNIGHT_UPSLASHEFFECT 84+#define CLIP_KNIGHT_UPSLASHEFFECT_F 85+#define CLIP_KNIGHT_UPSLASHEFFECT_M 86+#define CLIP_KNIGHT_WAKE 87+#define CLIP_KNIGHT_WAKE_TO_SIT 88+#define CLIP_KNIGHT_WAKE_UP_GROUND 89+#define CLIP_KNIGHT_WALK 90+#define CLIP_KNIGHT_WALL_SLASH 91+#define CLIP_KNIGHT_WALL_SLIDE 92+#define CLIP_KNIGHT_WALLJUMP 93+#define CLIP_KNIGHT_WALLJUMP_PUFF 94+#define CLIP_GEOROCK_IDLE_1 95+#define CLIP_GEOROCK_GLEAM_1 96+#define CLIP_GEOROCK_BROKEN_1 97+#define CLIP_GEOROCK_IDLE_2 98+#define CLIP_GEOROCK_GLEAM_2 99+#define CLIP_GEOROCK_BROKEN_2 100+#define CLIP_CHEST_IDLE 101+#define CLIP_CHEST_OPEN 102+#define CLIP_CHEST_BURST 103+#define CLIP_CHEST_OPENED 104+#define CLIP_HUD_HEALTH_EMPTY 105+#define CLIP_HUD_HEALTH_IDLE 106+#define CLIP_HUD_HEALTH_BREAK 107+#define CLIP_HUD_HEALTH_REFILL 108+#define CLIP_HUD_HEALTH_APPEAR 109+#define CLIP_HUD_BLUE_APPEAR 110+#define CLIP_HUD_BLUE_IDLE 111+#define CLIP_HUD_BLUE_BREAK 112+#define CLIP_HUD_BLUE_BREAK_FAST 113+#define CLIP_HUD_HUD_FRAME 114+#define CLIP_HUD_HUD_FRAME_IDLE 115+#define CLIP_HUD_HUD_FRAME_CRACKAPPEAR 116+#define CLIP_HUD_HUD_FRAME_CRACKED 117+#define CLIP_HUD_COIN_APPEAR 118+#define CLIP_HUD_COIN_IDLE 119+#define CLIP_HUD_COIN_GET 120+#define CLIP_HUD_SOUL_BURST 121+#define CLIP_LIQUID_FILL 122+#define CLIP_LIQUID_IDLE 123+#define CLIP_LIQUID_SHRINK 124+#define CLIP_LIQUID_DRAIN 125+#define CLIP_GEO_SMALL_IDLE 126+#define CLIP_GEO_SMALL_AIR 127+#define CLIP_GEO_MED_IDLE 128+#define CLIP_GEO_MED_AIR 129+#define CLIP_GEO_LARGE_IDLE 130+#define CLIP_GEO_LARGE_AIR 131+#define CLIP_SHOPUI_SHOP_MENU_TOP_UP 132+#define CLIP_SHOPUI_SHOP_MENU_TOP_DOWN 133+#define CLIP_SHOPUI_SHOP_MENU_BOTTOM_UP 134+#define CLIP_SHOPUI_SHOP_MENU_BOTTOM_DOWN 135+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_UP 136+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_DOWN 137+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_UP 138+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_DOWN 139+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_UP 140+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_DOWN 141+#define CLIP_HEARTUI_FLEUR_APPEAR 142+#define CLIP_HEARTUI_FLEUR_DISAPPEAR 143+#define CLIP_HEARTUI_GET_0 144+#define CLIP_HEARTUI_GET_1 145+#define CLIP_HEARTUI_GET_2 146+#define CLIP_HEARTUI_GET_3 147+#define CLIP_HEARTUI_GET_4 148+#define CLIP_HEARTUI_GOT_1 149+#define CLIP_HEARTUI_GOT_2 150+#define CLIP_HEARTUI_GOT_3 151+#define CLIP_HEARTUI_FUSE 152+#define CLIP_HEARTUI_HEAD_MOVE 153+#define CLIP_VESSELUI_GET_0 154+#define CLIP_VESSELUI_GET_1 155+#define CLIP_VESSELUI_GET_2 156+#define CLIP_VESSELUI_GET_3 157+#define CLIP_VESSELUI_GOT_1 158+#define CLIP_VESSELUI_GOT_2 159+#define CLIP_STAGUI_STAG_MAP_SELECTION_CURSOR 160+#define CLIP_STAGUI_STAG_BORDER_TOP_UP 161+#define CLIP_STAGUI_STAG_BORDER_TOP_DOWN 162+#define CLIP_STAGUI_STAG_BORDER_BOTTOM_UP 163+#define CLIP_STAGUI_STAG_BORDER_BOTTOM_DOWN 164+#define CLIP_MAPUI_IDLE 165+#define CLIP_MAPUI_WALK 166+#define CLIP_JOURNALMSG_MAP_WRITING 167+#define CLIP_JOURNALMSG_MAP_COMPLETE 168+#define CLIP_GEOBUG_LAMP_BUG_IDLE 169+#define CLIP_DIALOGUE_ARROW_UP 170+#define CLIP_DIALOGUE_ARROW_DOWN 171+#define CLIP_DIALOGUE_STOP_UP 172+#define CLIP_DIALOGUE_STOP_DOWN 173+#define CLIP_DIALOGUE_FLEUR_TOP_UP 174+#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 175+#define CLIP_DIALOGUE_FLEUR_BOT_UP 176+#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 177+#define CLIP_DIALOGUE_DREAM_UP 178+#define CLIP_DIALOGUE_DREAM_DOWN 179+#define CLIP_PROMPT_BLANK 180+#define CLIP_PROMPT_DOWN 181+#define CLIP_PROMPT_ENTER_DOWN 182+#define CLIP_PROMPT_ENTER_IDLE 183+#define CLIP_PROMPT_ENTER_UP 184+#define CLIP_PROMPT_IDLE 185+#define CLIP_PROMPT_LISTEN_DOWN 186+#define CLIP_PROMPT_LISTEN_IDLE 187+#define CLIP_PROMPT_LISTEN_UP 188+#define CLIP_PROMPT_UP 189+#define CLIP_SHADE_APPEAR 190+#define CLIP_SHADE_CAST 191+#define CLIP_SHADE_CAST_ANTIC 192+#define CLIP_SHADE_CAST_CHARGE 193+#define CLIP_SHADE_CAST_RING 194+#define CLIP_SHADE_DEATH 195+#define CLIP_SHADE_DEATH_GLOW 196+#define CLIP_SHADE_DEATH_START 197+#define CLIP_SHADE_DEPART 198+#define CLIP_SHADE_FIREBALL 199+#define CLIP_SHADE_FIREBALL_END 200+#define CLIP_SHADE_FLY 201+#define CLIP_SHADE_IDLE 202+#define CLIP_SHADE_RETREAT_END 203+#define CLIP_SHADE_RETREAT_START 204+#define CLIP_SHADE_SLASH 205+#define CLIP_SHADE_SLASH_ANTIC 206+#define CLIP_SHADE_SLASH_CD 207+#define CLIP_SHADE_SLASH_EFFECT 208+#define CLIP_SHADE_STARTLE 209+#define CLIP_SHADE_TURNTOFLY 210+#define CLIP_SHADE_TURNTOIDLE 211+#define CLIP_CRAWLER_WALK 212+#define CLIP_CRAWLER_TURN 213+#define CLIP_CRAWLER_IDLE 214+#define CLIP_CRAWLER_DEATH_AIR 215+#define CLIP_CRAWLER_DEATH_LAND 216+#define CLIP_BUZZER_CHASE 217+#define CLIP_BUZZER_IDLE 218+#define CLIP_BUZZER_STARTLE 219+#define CLIP_BUZZER_DEATH_AIR 220+#define CLIP_BUZZER_DEATH_LAND 221+#define CLIP_BUZZER_FLY 222+#define CLIP_BUZZER_TURNTOFLY 223+#define CLIP_BUZZER_TURNTOIDLE 224+#define CLIP_TIKTIK_DEATH_AIR 225+#define CLIP_TIKTIK_DEATH_LAND 226+#define CLIP_TIKTIK_STUN 227+#define CLIP_TIKTIK_WALK 228+#define CLIP_GRUZZER_DEATH_AIR 229+#define CLIP_GRUZZER_DEATH_LAND 230+#define CLIP_GRUZZER_FLY 231+#define CLIP_ASPID_DEATH_AIR 232+#define CLIP_ASPID_FIRE_LONG 233+#define CLIP_ASPID_FLY 234+#define CLIP_ASPID_TURNTOFLY 235+#define CLIP_BALDUR_DEATH_AIR 236+#define CLIP_BALDUR_DEATH_LAND 237+#define CLIP_BALDUR_IDLE 238+#define CLIP_BALDUR_ROLL 239+#define CLIP_BALDUR_START 240+#define CLIP_BALDUR_STOP 241+#define CLIP_ELDERBALDUR_CLOSE1 242+#define CLIP_ELDERBALDUR_CLOSE2 243+#define CLIP_ELDERBALDUR_CLOSED 244+#define CLIP_ELDERBALDUR_DEATH 245+#define CLIP_ELDERBALDUR_DEATH_STUN 246+#define CLIP_ELDERBALDUR_HIT 247+#define CLIP_ELDERBALDUR_IDLE 248+#define CLIP_ELDERBALDUR_OPEN 249+#define CLIP_ELDERBALDUR_SHOOT_ANTIC 250+#define CLIP_ELDERBALDUR_SHOOT_CD 251+#define CLIP_HUSK_ATTACK_ANTICIPATE 252+#define CLIP_HUSK_ATTACK_COOLDOWN 253+#define CLIP_HUSK_ATTACK_LUNGE 254+#define CLIP_HUSK_DEATH_AIR 255+#define CLIP_HUSK_DEATH_LAND 256+#define CLIP_HUSK_IDLE 257+#define CLIP_HUSK_TURN 258+#define CLIP_HUSK_WALK 259+#define CLIP_BARGER_ATTACK_ANTICIPATE 260+#define CLIP_BARGER_ATTACK_COOLDOWN 261+#define CLIP_BARGER_ATTACK_LUNGE 262+#define CLIP_BARGER_DEATH_AIR 263+#define CLIP_BARGER_DEATH_LAND 264+#define CLIP_BARGER_IDLE 265+#define CLIP_BARGER_TURN 266+#define CLIP_BARGER_WALK 267+#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 268+#define CLIP_HORNHEAD_ATTACK_COOLDOWN 269+#define CLIP_HORNHEAD_ATTACK_LUNGE 270+#define CLIP_HORNHEAD_DEATH_AIR 271+#define CLIP_HORNHEAD_DEATH_LAND 272+#define CLIP_HORNHEAD_IDLE 273+#define CLIP_HORNHEAD_TURN 274+#define CLIP_HORNHEAD_WALK 275+#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 276+#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 277+#define CLIP_MOSSRUNNER_ATTACK_LUNGE 278+#define CLIP_MOSSRUNNER_DEATH_AIR 279+#define CLIP_MOSSRUNNER_DEATH_LAND 280+#define CLIP_MOSSRUNNER_IDLE 281+#define CLIP_MOSSRUNNER_TURN 282+#define CLIP_MOSSRUNNER_WALK 283+#define CLIP_LEAPER_ATTACK 284+#define CLIP_LEAPER_DEATH_AIR 285+#define CLIP_LEAPER_DEATH_LAND 286+#define CLIP_LEAPER_IDLE 287+#define CLIP_LEAPER_LAND 288+#define CLIP_LEAPER_TURN 289+#define CLIP_LEAPER_WALK 290+#define CLIP_GUARD_ANTICIPATE 291+#define CLIP_GUARD_ATTACK2 292+#define CLIP_GUARD_DEATH_AIR 293+#define CLIP_GUARD_DEATH_LAND 294+#define CLIP_GUARD_DORMANT 295+#define CLIP_GUARD_IDLE 296+#define CLIP_GUARD_RUN 297+#define CLIP_GUARD_STARTLE 298+#define CLIP_GUARD_STOMP_ANTIC 299+#define CLIP_GUARD_STOMP_JUMP 300+#define CLIP_GUARD_STOMP_LAND 301+#define CLIP_GUARD_STOP_RUN 302+#define CLIP_GUARD_STOP_WALK 303+#define CLIP_GUARD_SWIPE 304+#define CLIP_GUARD_TURN 305+#define CLIP_GUARD_WAKE 306+#define CLIP_GUARD_WALK 307+#define CLIP_FK_ATTACK 308+#define CLIP_FK_ATTACK_ANTIC 309+#define CLIP_FK_ATTACK_RECOVER 310+#define CLIP_FK_BLANK 311+#define CLIP_FK_BODY 312+#define CLIP_FK_DEATH_FALL 313+#define CLIP_FK_DEATH_HEAD_1 314+#define CLIP_FK_DEATH_HEAD_2 315+#define CLIP_FK_DEATH_LAND 316+#define CLIP_FK_DEATH_SPAZ 317+#define CLIP_FK_IDLE 318+#define CLIP_FK_JUMP 319+#define CLIP_FK_JUMP_ANTIC 320+#define CLIP_FK_JUMP_ATTACK_HIT_1 321+#define CLIP_FK_JUMP_ATTACK_HIT_2 322+#define CLIP_FK_JUMP_ATTACK_HIT_3 323+#define CLIP_FK_JUMP_ATTACK_UP 324+#define CLIP_FK_LAND 325+#define CLIP_FK_RAGE 326+#define CLIP_FK_RUN 327+#define CLIP_FK_RUN_ANTIC 328+#define CLIP_FK_STUN_HIT 329+#define CLIP_FK_STUN_OPEN 330+#define CLIP_FK_STUN_OPENED 331+#define CLIP_FK_STUN_RECOVER 332+#define CLIP_FK_STUN_ROLL 333+#define CLIP_FK_STUN_ROLL_END 334+#define CLIP_FK_TURN 335+#define CLIP_FKHEAD_DEATH_LAND 336+#define CLIP_FKHEAD_HEAD_HIT 337+#define CLIP_FKHEAD_HEAD_IDLE 338+#define CLIP_FKHEAD_HEAD_SPAZ 339+#define CLIP_HATCHER_DEATH_AIR 340+#define CLIP_HATCHER_DEATH_LAND 341+#define CLIP_HATCHER_FIRE 342+#define CLIP_HATCHER_FLY 343+#define CLIP_HATCHLING_FLY 344+#define CLIP_SLUG_BOUNCE 345+#define CLIP_SLUG_DEATH_AIR 346+#define CLIP_SLUG_DEATH_LAND 347+#define CLIP_SLUG_IDLE_TODOWN 348+#define CLIP_SLUG_IDLE_TOUP 349+#define CLIP_SLUG_IDLE_UP 350+#define CLIP_SLUG_RUN 351+#define CLIP_SLUG_STARTLE 352+#define CLIP_GFLY_BURST 353+#define CLIP_GFLY_CHARGE 354+#define CLIP_GFLY_CHARGE_ANTIC 355+#define CLIP_GFLY_CHARGE_RECOVER 356+#define CLIP_GFLY_DEATH 357+#define CLIP_GFLY_FALL 358+#define CLIP_GFLY_FLY 359+#define CLIP_GFLY_GURGLE_LOOP 360+#define CLIP_GFLY_GURGLE_ONCE 361+#define CLIP_GFLY_SLAM_DOWN 362+#define CLIP_GFLY_SLAM_END 363+#define CLIP_GFLY_SLAM_UP 364+#define CLIP_GFLY_SLEEP 365+#define CLIP_GFLY_STOP 366+#define CLIP_GFLY_WAKE 367+#define CLIP_GFLY_WIGGLE 368+#define CLIP_MOSSWALKER_APPEAR 369+#define CLIP_MOSSWALKER_BURY 370+#define CLIP_MOSSWALKER_DEATH_AIR 371+#define CLIP_MOSSWALKER_DEATH_LAND 372+#define CLIP_MOSSWALKER_SHAKE 373+#define CLIP_MOSSWALKER_TURN 374+#define CLIP_MOSSWALKER_WALK 375+#define CLIP_PIGEON_FLY 376+#define CLIP_PIGEON_IDLE_01 377+#define CLIP_PIGEON_IDLE_02 378+#define CLIP_PIGEON_IDLE_03 379+#define CLIP_PLANTTRAP_DEATH 380+#define CLIP_PLANTTRAP_IDLE 381+#define CLIP_PLANTTRAP_RETRACT 382+#define CLIP_PLANTTRAP_SNAP 383+#define CLIP_PLANTTRAP_SNAP_READY 384+#define CLIP_SHAKER_ATTACK 385+#define CLIP_SHAKER_DEATH_AIR 386+#define CLIP_SHAKER_DEATH_LAND 387+#define CLIP_SHAKER_IDLE 388+#define CLIP_SHAKER_TURN 389+#define CLIP_SHAKER_WALK 390+#define CLIP_MOSQUITO_ATTACK 391+#define CLIP_MOSQUITO_ATTACK_ANTIC 392+#define CLIP_MOSQUITO_DEATH_AIR 393+#define CLIP_MOSQUITO_DEATH_LAND 394+#define CLIP_MOSQUITO_IDLE 395+#define CLIP_MOSQUITO_STARTLE 396+#define CLIP_MOSQUITO_TURNTOIDLE 397+#define CLIP_FATFLY_ATTACK 398+#define CLIP_FATFLY_DEATH_AIR 399+#define CLIP_FATFLY_DEATH_LAND 400+#define CLIP_FATFLY_FLY 401+#define CLIP_MOSSCHARGER_APPEAR 402+#define CLIP_MOSSCHARGER_CHARGE 403+#define CLIP_MOSSCHARGER_DEATH_AIR 404+#define CLIP_MOSSCHARGER_DEATH_LAND 405+#define CLIP_MOSSCHARGER_DISAPPEAR 406+#define CLIP_MOSSCHARGER_ESCAPE 407+#define CLIP_MOSSCHARGER_GET_UP 408+#define CLIP_MOSSCHARGER_STUN 409+#define CLIP_MOSSCHARGER_TURNRUN 410+#define CLIP_MOSSKNIGHT_DEATH_AIR 411+#define CLIP_MOSSKNIGHT_DEATH_LAND 412+#define CLIP_MOSSKNIGHT_DORMANT_1 413+#define CLIP_MOSSKNIGHT_DORMANT_2 414+#define CLIP_MOSSKNIGHT_EVADE 415+#define CLIP_MOSSKNIGHT_IDLE 416+#define CLIP_MOSSKNIGHT_SHAKE 417+#define CLIP_MOSSKNIGHT_SHIELD_FRONT 418+#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 419+#define CLIP_MOSSKNIGHT_SHIELD_TOP 420+#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 421+#define CLIP_MOSSKNIGHT_SHOOT 422+#define CLIP_MOSSKNIGHT_SHOOT_END 423+#define CLIP_MOSSKNIGHT_SLASH 424+#define CLIP_MOSSKNIGHT_SLASH_2 425+#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 426+#define CLIP_MOSSKNIGHT_SLASH_EFFECT 427+#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 428+#define CLIP_MOSSKNIGHT_SLASH_END 429+#define CLIP_MOSSKNIGHT_SLASH_QUICK 430+#define CLIP_MOSSKNIGHT_TURN 431+#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 432+#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 433+#define CLIP_MOSSKNIGHT_WAKE 434+#define CLIP_MOSSKNIGHT_WALK 435+#define CLIP_HORNET_A_DASH 436+#define CLIP_HORNET_A_DASH_ANTIC 437+#define CLIP_HORNET_AIR_DASH_EFFECT 438+#define CLIP_HORNET_DEATH_AIR 439+#define CLIP_HORNET_EVADE 440+#define CLIP_HORNET_EVADE_ANTIC 441+#define CLIP_HORNET_FALL 442+#define CLIP_HORNET_FLASH 443+#define CLIP_HORNET_FLOURISH 444+#define CLIP_HORNET_G_DASH 445+#define CLIP_HORNET_G_DASH_ANTIC 446+#define CLIP_HORNET_G_DASH_EFFECT 447+#define CLIP_HORNET_G_DASH_RECOVER1 448+#define CLIP_HORNET_G_DASH_RECOVER2 449+#define CLIP_HORNET_HARD_LAND 450+#define CLIP_HORNET_IDLE 451+#define CLIP_HORNET_JUMP 452+#define CLIP_HORNET_JUMP_ANTIC 453+#define CLIP_HORNET_LAND 454+#define CLIP_HORNET_NEEDLE 455+#define CLIP_HORNET_NEEDLE_THREAD 456+#define CLIP_HORNET_RUN 457+#define CLIP_HORNET_SPHERE_ANTIC_A 458+#define CLIP_HORNET_SPHERE_ANTIC_G 459+#define CLIP_HORNET_SPHERE_ATTACK 460+#define CLIP_HORNET_SPHERE_BALL 461+#define CLIP_HORNET_SPHERE_RECOVER_A 462+#define CLIP_HORNET_SPHERE_RECOVER_G 463+#define CLIP_HORNET_STUN 464+#define CLIP_HORNET_STUN_AIR 465+#define CLIP_HORNET_THROW 466+#define CLIP_HORNET_THROW_ANTIC 467+#define CLIP_HORNET_THROW_EFFECT 468+#define CLIP_HORNET_THROW_RECOVER 469+#define CLIP_HORNET_WALL_IMPACT 470+#define CLIP_HORNET_WOUNDED 471+#define CLIP_MENDER_DEATH_AIR 472+#define CLIP_MENDER_DEATH_LAND 473+#define CLIP_MENDER_FLY 474+#define CLIP_MENDER_IDLE 475+#define CLIP_MENDER_STARTLE 476+#define CLIP_BGATE_BG_CLOSE_1 477+#define CLIP_BGATE_BG_CLOSE_2 478+#define CLIP_BGATE_BG_CLOSED 479+#define CLIP_BGATE_BG_OPEN 480+#define CLIP_BGATE_BG_OPENED 481+#define CLIP_BGATE_BONE_GATE_CLOSE 482+#define CLIP_BGATE_BONE_GATE_CLOSED 483+#define CLIP_BGATE_BONE_GATE_OPEN 484+#define CLIP_BGATE_BONE_GATE_OPENED 485+#define CLIP_BGATE_GATE_IDLE 486+#define CLIP_BGATE_GATE_OPEN 487+#define CLIP_BGATE_GATE_OPENED 488+#define CLIP_BGATE_PILLAR_IDLE 489+#define CLIP_BGATE_PILLAR_OPENED 490+#define CLIP_BGATE_SWITCH_ACTIVATED 491+#define CLIP_BGATE_SWITCH_HIT 492+#define CLIP_BGATE_SWITCH_IDLE 493+#define CLIP_BGATE_TOLL_GATE_IDLE 494+#define CLIP_BGATE_TOLL_GATE_OPEN 495+#define CLIP_COCOON_COCOON_IDLE 496+#define CLIP_COCOON_COCOON_SWEAT 497+#define CLIP_COCOON_SCUTTLER_LAND 498+#define CLIP_COCOON_SCUTTLER_RUN 499+#define CLIP_FX_SPLAT 500+#define CLIP_FX_SPLAT2 501+#define CLIP_FX_SWORD 502+#define CLIP_FIREBALL_BLAST 503+#define CLIP_FIREBALL_BALL 504+#define CLIP_FIREBALL_BALL_END 505+#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 506+#define CLIP_DRIP_IDLE 507+#define CLIP_DRIP_DRIP 508+#define CLIP_DRIP_FALL 509+#define CLIP_DRIP_IMPACT 510+#define CLIP_HORNETCS_EVADE 511+#define CLIP_HORNETCS_EVADE_ANTIC 512+#define CLIP_HORNETCS_FALL 513+#define CLIP_HORNETCS_HARPOON_SIDE 514+#define CLIP_HORNETCS_IDLE 515+#define CLIP_HORNETCS_JUMP_FULL 516+#define CLIP_HORNETCS_POINT 517+#define CLIP_HORNETCS_RUN 518+#define CLIP_HORNETCS_SOFT_LAND 519+#define CLIP_HORNETCS_THREAD_1 520+#define CLIP_HORNETCS_THROW_SIDE 521+#define CLIP_HORNETCS_THROW_SIDE_START 522+#define CLIP_HORNETCS_TURN 523+#define CLIP_HORNETCS_TURNTOIDLE 524+#define CLIP_BULLET_IDLE 525+#define CLIP_BULLET_IMPACT 526+#define CLIP_BULLET_SHOCKWAVE_SPURT 527+#define CLIP_PROP0_WATERFALL_LOOP 528+#define CLIP_PROP1_TORCH2 529+#define CLIP_PROP1_TORCH3 530+#define CLIP_VM0_FLOWER 531+#define CLIP_VM0_IDLE 532+#define CLIP_VM0_REACH 533+#define CLIP_VM0_REACH_TO_IDLE 534+#define CLIP_VM0_TALK_LEFT 535+#define CLIP_VM0_TALK_RIGHT 536+#define CLIP_VM0_TURN_LEFT 537+#define CLIP_VM0_TURN_RIGHT 538+#define CLIP_VM2_IDLE 539+#define CLIP_VM2_LOOKLEFT 540+#define CLIP_VM2_LOOKRIGHT 541+#define CLIP_VM3_IDLE 542+#define CLIP_VM3_TALK 543+#define CLIP_VM3_TALK_END 544+#define CLIP_VM4_IDLE 545+#define CLIP_VM4_LOOKLEFT 546+#define CLIP_VM4_LOOKRIGHT 547+#define CLIP_VM4_SIT 548+#define CLIP_VM4_SIT_TALK 549+#define CLIP_VM4_SIT_TALK_END 550+#define CLIP_VM5_ARRIVE 551+#define CLIP_VM5_ARRIVE_SMOKE 552+#define CLIP_VM5_IDLE 553+#define CLIP_VM6_BELL_IDLE 554+#define CLIP_VM6_BELL_RING_R 555+#define CLIP_VM6_BELL_STAND 556+#define CLIP_VM6_BELL_STAND_APPEAR 557+#define CLIP_VM6_BOX_DISAPPEAR 558+#define CLIP_VM6_BOX_DISAPPEAR_QUICK 559+#define CLIP_VM6_BOX_IDLE 560+#define CLIP_VM6_FRONT 561+#define CLIP_VM6_GRATE_DISAPPEAR 562+#define CLIP_VM6_GRATE_IDLE 563+#define CLIP_VM8_DAZED 564+#define CLIP_VM8_IDLE 565+#define CLIP_VM8_TURN_L 566+#define CLIP_VM8_TURN_R 567+#define CLIP_VM8_WAKE 568+#define CLIP_VM11_HEGEMOL_CAST 569+#define CLIP_VM11_HEGEMOL_IDLE 570+#define CLIP_VM11_LURIEN_CAST 571+#define CLIP_VM11_LURIEN_IDLE 572+#define CLIP_VM11_MONOMON_CAST 573+#define CLIP_VM11_MONOMON_IDLE 574+#define CLIP_VM12_IDLE 575+#define CLIP_VM12_SIT_IDLE 576+#define CLIP_VM12_SIT_TALK 577+#define CLIP_VM12_SIT_TALK_END 578+#define CLIP_VM12_SUMMON 579+#define CLIP_VM12_TALK 580+#define CLIP_VM12_TALK_END 581+#define CLIP_VM12_TURN 582+#define CLIP_VM14_IDLE 583+#define CLIP_VM14_LOOK_LEFT 584+#define CLIP_VM14_LOOK_RIGHT 585+#define CLIP_VM14_TALK_CONVO_END 586+#define CLIP_VM14_TALK_CONVO_START 587+#define CLIP_VM14_TALK_SHOP_END 588+#define CLIP_VM14_TALK_SHOP_START 589+#define CLIP_VM15_IDLE 590+#define CLIP_VM15_SHOP_END 591+#define CLIP_VM15_SHOP_START 592+#define CLIP_VM15_TALK_END 593+#define CLIP_VM15_TALK_START 594+#define CLIP_VM16_CRY 595+#define CLIP_VM16_CRY_TURN 596+#define CLIP_VM16_FREED 597+#define CLIP_VM16_HOME_BOUNCE 598+#define CLIP_VM16_HOME_WAVE 599+#define CLIP_VM16_IDLE 600+#define CLIP_VM17_CRUMBLE 601+#define CLIP_VM17_IDLE 602+#define CLIP_VM18_BECKON 603+#define CLIP_VM18_CHEER 604+#define CLIP_VM18_CRY 605+#define CLIP_VM18_GIFT 606+#define CLIP_VM18_IDLE 607+#define CLIP_VM20_RIPPLE_WATER 608+#define CLIP_VM21_IDLE 609+#define CLIP_VM21_TALK_L 610+#define CLIP_VM21_TALK_L_END 611+#define CLIP_VM21_TALK_R 612+#define CLIP_VM21_TALK_R_END 613+#define CLIP_ANIM0_STAG_DOOR_OPEN00 614+#define CLIP_ANIM1_DASH_CLOAK_CORPSE000 615+#define CLIP_ANIM2_GROUND_PLINK_0 616+#define CLIP_ANIM3_FIREBALL_COLLECT_ANIM 617+#define CLIP_ANIM4_DOOR_OPEN00 618+#define SPRITE_HERO_LIGHT 2894+#define SPRITE_DIALOGUE_BACKBOARD 2895+#define SPRITE_PROMPT_SHADOW 2896+#define SPRITE_CORPSE_NAIL 2897+#define SPRITE_FK_BARREL 2898+#define SPRITE_FK_STAFF 2899+#define SPRITE_DIGIT0 3468#define STYLE_DIALOGUE 0#define STYLE_PROMPT 1#define STYLE_TITLE_L 2@@ -729,7 +737,7 @@#define EK_HORNET 29#define EK_MENDER 30#define NUM_KINDS 31-#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 205, 204, -1, -1, -1, -1, -1, -1, -1, -1, 207, 208}}, {EF_BUZZER, {210, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 212, 213}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 220, 219, -1, -1, -1, -1, -1, -1, -1, 217, 218}}, {EF_BOUNCER, {-1, -1, -1, 223, -1, -1, -1, -1, -1, -1, -1, 221, 222}}, {EF_SPITTER, {-1, -1, -1, 226, 227, 225, -1, -1, -1, -1, -1, 224, -1}}, {EF_ROLLER, {230, -1, -1, 232, 231, 233, -1, -1, -1, -1, -1, 228, 229}}, {EF_BLOCKER, {240, -1, -1, 236, 241, 234, 235, 242, 243, 239, 238, -1, 237}}, {EF_HUSK, {249, 250, 251, 244, 246, 245, -1, -1, -1, -1, -1, 247, 248}}, {EF_HUSK, {257, 258, 259, 252, 254, 253, -1, -1, -1, -1, -1, 255, 256}}, {EF_HUSK, {265, 266, 267, 260, 262, 261, -1, -1, -1, -1, -1, 263, 264}}, {EF_HUSK, {273, 274, 275, 268, 270, 269, -1, -1, -1, -1, -1, 271, 272}}, {EF_LEAPER, {279, 281, 282, 276, 280, -1, -1, -1, -1, -1, -1, 277, 278}}, {EF_GUARD, {288, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 285, 286}}, {EF_FK, {310, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 308}}, {EF_FKHEAD, {330, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 328}}, {EF_HATCHER, {-1, -1, -1, 335, 334, -1, -1, -1, -1, -1, -1, 332, 333}}, {EF_HATCHLING, {-1, -1, -1, 336, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {342, -1, -1, 340, 341, 344, 343, 337, -1, -1, -1, 338, 339}}, {EF_GFLY, {357, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 366, 367, 365, 361, 362, -1, -1, -1, -1, -1, 363, 364}}, {EF_PIGEON, {-1, -1, -1, 369, 370, 371, 368, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {373, -1, -1, 376, 375, 374, -1, -1, -1, -1, -1, 372, -1}}, {EF_SHAKER, {380, 381, 382, 377, -1, -1, -1, -1, -1, -1, -1, 378, 379}}, {EF_MOSQUITO, {387, -1, -1, 389, 388, 384, 383, -1, -1, -1, -1, 385, 386}}, {EF_FATFLY, {393, -1, -1, 390, -1, -1, -1, -1, -1, -1, -1, 391, 392}}, {EF_MOSSCHARGER, {-1, -1, -1, 394, 395, 398, 401, 400, 402, 399, -1, 396, 397}}, {EF_MOSSKNIGHT, {408, 423, 427, -1, -1, -1, -1, -1, -1, -1, -1, 403, 404}}, {EF_HORNET, {443, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 431, -1}}, {EF_MENDER, {467, -1, -1, 468, 466, -1, -1, -1, -1, -1, -1, 464, 465}}}+#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 213, 212, -1, -1, -1, -1, -1, -1, -1, -1, 215, 216}}, {EF_BUZZER, {218, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 220, 221}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 228, 227, -1, -1, -1, -1, -1, -1, -1, 225, 226}}, {EF_BOUNCER, {-1, -1, -1, 231, -1, -1, -1, -1, -1, -1, -1, 229, 230}}, {EF_SPITTER, {-1, -1, -1, 234, 235, 233, -1, -1, -1, -1, -1, 232, -1}}, {EF_ROLLER, {238, -1, -1, 240, 239, 241, -1, -1, -1, -1, -1, 236, 237}}, {EF_BLOCKER, {248, -1, -1, 244, 249, 242, 243, 250, 251, 247, 246, -1, 245}}, {EF_HUSK, {257, 258, 259, 252, 254, 253, -1, -1, -1, -1, -1, 255, 256}}, {EF_HUSK, {265, 266, 267, 260, 262, 261, -1, -1, -1, -1, -1, 263, 264}}, {EF_HUSK, {273, 274, 275, 268, 270, 269, -1, -1, -1, -1, -1, 271, 272}}, {EF_HUSK, {281, 282, 283, 276, 278, 277, -1, -1, -1, -1, -1, 279, 280}}, {EF_LEAPER, {287, 289, 290, 284, 288, -1, -1, -1, -1, -1, -1, 285, 286}}, {EF_GUARD, {296, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 293, 294}}, {EF_FK, {318, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 316}}, {EF_FKHEAD, {338, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 336}}, {EF_HATCHER, {-1, -1, -1, 343, 342, -1, -1, -1, -1, -1, -1, 340, 341}}, {EF_HATCHLING, {-1, -1, -1, 344, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {350, -1, -1, 348, 349, 352, 351, 345, -1, -1, -1, 346, 347}}, {EF_GFLY, {365, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 374, 375, 373, 369, 370, -1, -1, -1, -1, -1, 371, 372}}, {EF_PIGEON, {-1, -1, -1, 377, 378, 379, 376, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {381, -1, -1, 384, 383, 382, -1, -1, -1, -1, -1, 380, -1}}, {EF_SHAKER, {388, 389, 390, 385, -1, -1, -1, -1, -1, -1, -1, 386, 387}}, {EF_MOSQUITO, {395, -1, -1, 397, 396, 392, 391, -1, -1, -1, -1, 393, 394}}, {EF_FATFLY, {401, -1, -1, 398, -1, -1, -1, -1, -1, -1, -1, 399, 400}}, {EF_MOSSCHARGER, {-1, -1, -1, 402, 403, 406, 409, 408, 410, 407, -1, 404, 405}}, {EF_MOSSKNIGHT, {416, 431, 435, -1, -1, -1, -1, -1, -1, -1, -1, 411, 412}}, {EF_HORNET, {451, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 439, -1}}, {EF_MENDER, {475, -1, -1, 476, 474, -1, -1, -1, -1, -1, -1, 472, 473}}}#define TXT_PROMPT_LISTEN 108#define TXT_PROMPT_REST 109#define TXT_PROMPT_INSPECT 110@@ -968,73 +976,73 @@#define TITLE_CHARM_SLUG 19#define NUM_TITLES 20#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 2874+#define SPRITE_FLEUR_TOP 2900#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 2875+#define SPRITE_FLEUR_BOT 2901#define FLEUR_BOT_RECTS {{0.000f, 0.000f, 0.016f, 0.016f}, {0.000f, 0.000f, 0.016f, 0.016f}, {0.391f, 0.406f, 0.828f, 0.844f}, {-1.063f, 0.281f, 1.516f, 1.016f}, {-1.594f, -0.047f, 2.109f, 1.031f}, {-1.984f, -0.156f, 2.375f, 1.047f}, {-2.531f, -0.438f, 2.719f, 1.172f}, {-2.688f, -0.594f, 2.766f, 1.188f}, {-2.797f, -0.797f, 3.156f, 1.219f}, {-3.078f, -0.938f, 3.219f, 1.219f}, {-3.250f, -1.156f, 3.438f, 1.219f}, {-3.250f, -1.172f, 3.828f, 1.219f}, {-3.781f, -1.188f, 4.203f, 1.234f}, {-3.984f, -1.188f, 4.344f, 1.234f}, {-4.281f, -1.203f, 4.562f, 1.234f}, {-4.406f, -1.203f, 4.641f, 1.234f}, {-4.578f, -1.219f, 4.719f, 1.234f}, {-4.656f, -1.219f, 4.719f, 1.234f}, {-4.734f, -1.219f, 4.734f, 1.234f}, {-4.750f, -1.234f, 4.734f, 1.234f}, {-4.766f, -1.234f, 4.734f, 1.250f}, {-4.766f, -1.234f, 4.734f, 1.250f}}-#define VM_PIECE_BASE 2854-#define SPRITE_MSG_BG 2876-#define SPRITE_MSG_STOP 2877-#define SPRITE_MSG_FLEUR 2878-#define SPRITE_MSG_KEY 2879-#define SPRITE_MSG_ICON_FIREBALL 2880-#define SPRITE_MSG_ICON_DASH 2881-#define SPRITE_GRASS_BALL 2882-#define SPRITE_SOUL_ORB 2883+#define VM_PIECE_BASE 2880+#define SPRITE_MSG_BG 2902+#define SPRITE_MSG_STOP 2903+#define SPRITE_MSG_FLEUR 2904+#define SPRITE_MSG_KEY 2905+#define SPRITE_MSG_ICON_FIREBALL 2906+#define SPRITE_MSG_ICON_DASH 2907+#define SPRITE_GRASS_BALL 2908+#define SPRITE_SOUL_ORB 2909#define SOUL_ORB_SORT {13, 0}#define MSG_TABLE {{168, 169, 170, 171, 172, 173}, {174, 175, 176, 177, 178, 179}}-#define NOTICE_BACKBOARD {2884, 1.0000f, 0.6931f}-#define TUTE_FLEUR {2878, 1.0000f, 1.0000f}-#define TUTE_BACKBOARD {2885, 1.0000f, 0.9560f}-#define TUTE_IMAGE {2886, 1.0000f, 1.0000f}-#define TUTE_STOP {2877, 1.0000f, 1.0000f}-#define FOCUS_PROMPT_BG {2887, 0.0000f, -1.7900f, 1.0000f, 1.0000f}+#define NOTICE_BACKBOARD {2910, 1.0000f, 0.6931f}+#define TUTE_FLEUR {2904, 1.0000f, 1.0000f}+#define TUTE_BACKBOARD {2911, 1.0000f, 0.9560f}+#define TUTE_IMAGE {2912, 1.0000f, 1.0000f}+#define TUTE_STOP {2903, 1.0000f, 1.0000f}+#define FOCUS_PROMPT_BG {2913, 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 {2888, 2889, 2890, 2891}+#define NOTICE_ICONS {2914, 2915, 2916, 2917}#define CHARM_ICON_K 1.5000f-#define CHARM_ICONS {-1, 2892, 2893, 2894, 2895, -1, 2896, 2897, 2898, -1, -1, -1, -1, -1, 2899, -1, -1, -1, 2900, 2901, 2902, -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 {2903, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CHARM_ICONS {-1, 2918, 2919, 2920, 2921, -1, 2922, 2923, 2924, -1, -1, -1, -1, 2925, 2926, -1, -1, -1, 2927, 2928, 2929, -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, 191, 192, -1, -1, -1, 193, 194, 195, -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 196+#define TXT_CHARM_TUTE_SUB 197+#define TXT_CHARM_REMINDER 198+#define TXT_YN_YES 199+#define TXT_YN_NO 200+#define TXT_YN_NOT_ENOUGH 201+#define MENU_LOGO {2930, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_LOGO_Y 3.6585f#define MENU_START_Y -1.4181f#define MENU_HELP_Y -2.3582f#define MENU_QUIT_Y -3.2982f-#define MENU_POINTER {2904, 0.0000f, 0.0000f, 1.0023f, 1.0000f}+#define MENU_POINTER {2931, 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 {2905, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_PROFILES_FLEUR {2932, 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, {2906, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2907, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2908, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2909, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {9, {-1, 0, 0, 1, 1}}, {22, {2910, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {24, {-1, 0, 0, 1, 1}}, {35, {-1, 0, 0, 1, 1}}}+#define MENU_SLOT_ZONES {{2, {2933, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2934, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2935, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2936, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {9, {-1, 0, 0, 1, 1}}, {22, {2937, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {24, {-1, 0, 0, 1, 1}}, {35, {-1, 0, 0, 1, 1}}}#define MENU_SLOT_NZONES 8#define MENU_SLOT_BG_DY 0.0102f-#define MENU_SLOT_FLEUR {2911, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_FLEUR {2938, 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 {2912, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_SELECTOR {2939, 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 {2913, 0.0000f, 0.0000f, 1.0000f, 1.0025f}+#define MENU_SLOT_CURSOR {2940, 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 {2914, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_ORB {2941, 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 {2915, 0.0000f, 0.0000f, 1.0039f, 1.0000f}+#define MENU_SLOT_GEO {2942, 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 {2916, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_HEALTH {2943, 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@@ -1052,80 +1060,80 @@#define MENU_SLOT_YES_X 2.5813f#define MENU_SLOT_NO_X 6.2296f#define MENU_BACK_Y -5.5406f-#define MENU_PAUSE_TOP {2917, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_TOP {2944, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_TOP_Y 2.3653f-#define MENU_PAUSE_BOT {2918, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_BOT {2945, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_BOT_Y -1.8877f#define MENU_PAUSE_CONTINUE_Y 1.1916f#define MENU_PAUSE_HELP_Y 0.0940f#define MENU_PAUSE_QUIT_Y -1.0035f#define MENU_KEYS_TITLE_Y 5.7763f-#define MENU_KEYS_FLEUR {2905, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_KEYS_FLEUR {2932, 0.0000f, 0.0000f, 1.0000f, 1.0807f}#define MENU_KEYS_FLEUR_Y 4.7346f#define MENU_KEYS_ROW_Y 3.1809f#define MENU_KEYS_DY -1.0162f#define MENU_KEYS_BUTTON_Y -5.8306f-#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_PROFILE_LOADING 212-#define TXT_SCREEN_SAVE_PROFILES 213-#define TXT_SCREEN_KEYBOARD 214-#define MENU_KEYS {{215, 226}, {216, 227}, {217, 228}, {218, 229}, {219, 230}, {220, 231}, {221, 232}, {222, 233}, {223, 234}, {224, 235}, {225, 236}}+#define TXT_MAIN_START 202+#define TXT_MAIN_QUIT 203+#define TXT_PROFILE_NEW_GAME 204+#define TXT_PROFILE_CLEAR_BUTTON 205+#define TXT_PROFILE_CLEAR_PROMPT 206+#define TXT_NAV_YES 207+#define TXT_NAV_NO 208+#define TXT_NAV_BACK 209+#define TXT_PAUSE_CONTINUE 210+#define TXT_PAUSE_MAIN 211+#define TXT_PROFILE_CORRUPTED 212+#define TXT_PROFILE_LOADING 213+#define TXT_SCREEN_SAVE_PROFILES 214+#define TXT_SCREEN_KEYBOARD 215+#define MENU_KEYS {{216, 227}, {217, 228}, {218, 229}, {219, 230}, {220, 231}, {221, 232}, {222, 233}, {223, 234}, {224, 235}, {225, 236}, {226, 237}}#define MENU_NKEYS 11-#define TXT_HELP 237-#define TXT_HELP_TITLE 238-#define TXT_NEXT 239-#define TXT_HELP_LINES 240-#define TXT_ZONES {241, 242, 243, 244, 245, 246, 247, 248}-#define TXT_CROSS_TO 249-#define TXT_CROSS_APPS {250, 251}+#define TXT_HELP 238+#define TXT_HELP_TITLE 239+#define TXT_NEXT 240+#define TXT_HELP_LINES 241+#define TXT_ZONES {242, 243, 244, 245, 246, 247, 248, 249}+#define TXT_CROSS_TO 250+#define TXT_CROSS_APPS {251, 252}#define CROSS_NAPPS 2-#define TXT_CROSS_SAVED 252-#define TXT_CROSS_NEW 253+#define TXT_CROSS_SAVED 253+#define TXT_CROSS_NEW 254#define INV_X -4.0500f#define INV_Y 7.5500f-#define INV_BORDER {{2919, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2919, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2920, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2921, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2922, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2923, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}+#define INV_BORDER {{2946, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2946, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2947, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2948, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2949, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2950, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}#define INV_NBORDER 6-#define INV_FRAME {2924, 4.0479f, -7.1963f, 1.0f, 1.0f}-#define INV_ARROW_L {2925, -9.8300f, -7.2000f, 1.0000f, 1.0000f}-#define INV_ARROW_R {2925, 18.0300f, -7.2000f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_L {2926, -9.8600f, -0.4300f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_R {2926, 18.0400f, -0.4300f, 1.0000f, 1.0000f}+#define INV_FRAME {2951, 4.0479f, -7.1963f, 1.0f, 1.0f}+#define INV_ARROW_L {2952, -9.8300f, -7.2000f, 1.0000f, 1.0000f}+#define INV_ARROW_R {2952, 18.0300f, -7.2000f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_L {2953, -9.8600f, -0.4300f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_R {2953, 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 {256, 257, 258, 259}-#define CH_BB {2927, -7.9200f, -8.3700f, 1.0000f, 1.0000f}+#define TXT_INV_PANES {257, 258, 259, 260}+#define CH_BB {2954, -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 {2928, 0.0500f, 0.0600f, 1.0000f, 0.9919f}+#define CH_GLOW {2955, 0.0500f, 0.0600f, 1.0000f, 0.9919f}#define CH_GLOW_A 0.6970f-#define CH_ICONS {-1, 2892, 2893, 2894, 2895, -1, 2896, 2897, 2898, -1, -1, -1, -1, -1, 2899, -1, -1, -1, 2900, 2901, 2902, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define CH_NEXT_DOT {2929, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_ICONS {-1, 2918, 2919, 2920, 2921, -1, 2922, 2923, 2924, -1, -1, -1, -1, 2925, 2926, -1, -1, -1, 2927, 2928, 2929, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CH_NEXT_DOT {2956, 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 {2930, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define CH_NOTCH_EMPTY {2931, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_FULL {2957, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_EMPTY {2958, 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 {2932, -0.8400f, -6.9300f, 1.0000f, 0.1591f}+#define CH_DIVIDER {2959, -0.8400f, -6.9300f, 1.0000f, 0.1591f}#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}-#define CH_COST_PIP {2930, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_COST_PIP {2957, 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@@ -1134,60 +1142,60 @@#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 {2933, 16.3208f, -13.2878f, 1.0f, 1.0f}+#define CH_CONFIRM_KEY {2960, 16.3208f, -13.2878f, 1.0f, 1.0f}#define CH_CONFIRM_KEY_W 0.6412f-#define CH_CURSOR {2934, 0.0000f, 0.0000f, 1.0000f, 0.9756f}+#define CH_CURSOR {2961, 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 260-#define TXT_CHARM_TXT_OVERCHARMED 261-#define TXT_CHARM_TXT_COST 262-#define TXT_CTRL_EQUIP 263-#define TXT_CTRL_UNEQUIP 264-#define TXT_CHARM_ALERT_NONE 265-#define TXT_CHARM_ALERT_NONE_BENCH 266-#define TXT_CHARM_NOTCHES 267-#define TXT_CHARM_NAMES_INV {-1, 268, 269, 270, 271, -1, 272, 273, 274, -1, -1, -1, -1, -1, 275, -1, -1, -1, 276, 277, 278, -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, 279, 280, 281, 282, -1, 283, 284, 285, -1, -1, -1, -1, -1, 286, -1, -1, -1, 287, 288, 289, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define TXT_KEY_OK 290-#define TXT_CHARM_BENCH 291-#define INV_FIXED {{2935, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2936, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2937, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2938, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2939, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2940, -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}, {2941, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2942, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}+#define TXT_CHARM_TXT_EQUIPPED 261+#define TXT_CHARM_TXT_OVERCHARMED 262+#define TXT_CHARM_TXT_COST 263+#define TXT_CTRL_EQUIP 264+#define TXT_CTRL_UNEQUIP 265+#define TXT_CHARM_ALERT_NONE 266+#define TXT_CHARM_ALERT_NONE_BENCH 267+#define TXT_CHARM_NOTCHES 268+#define TXT_CHARM_NAMES_INV {-1, 269, 270, 271, 272, -1, 273, 274, 275, -1, -1, -1, -1, 276, 277, -1, -1, -1, 278, 279, 280, -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, 281, 282, 283, 284, -1, 285, 286, 287, -1, -1, -1, -1, 288, 289, -1, -1, -1, 290, 291, 292, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define TXT_KEY_OK 293+#define TXT_CHARM_BENCH 294+#define INV_FIXED {{2962, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2963, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2964, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2965, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2966, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2967, -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}, {2968, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2969, -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 {{2943, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2944, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2945, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2946, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}-#define INV_VESSEL_PIECES {{2947, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2948, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2949, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}+#define INV_HEART_PIECES {{2970, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2971, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2972, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2973, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}+#define INV_VESSEL_PIECES {{2974, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2975, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2976, -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 {{2950, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2951, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2952, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2953, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2954, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2955, 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 {{2956, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2957, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2958, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2959, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}+#define INV_EQ {{2977, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2978, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2979, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2980, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2981, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2982, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2983, 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}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}}+#define INV_TRINKETS {{2984, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2985, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2986, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2987, 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 {2960, 4.2400f, -10.8700f, 1.0000f, 1.0000f}-#define INV_DIVIDERS {{2961, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2961, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}+#define INV_TRINKET_BB {2988, 4.2400f, -10.8700f, 1.0000f, 1.0000f}+#define INV_DIVIDERS {{2989, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2989, 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 {{292, 293}, {294, 295}, {296, 297}, {294, 298}, {294, 299}, {300, 301}}-#define TXT_INV_VESSEL {{292, 293}, {302, 303}, {304, 305}, {302, 306}, {307, 308}}-#define TXT_INV_FIXED {{309, 310}, {311, 312}, {313, 314}, {315, 316}}-#define TXT_INV_EQ {{317, 318}, {319, 320}, {321, 322}, {323, 324}, {325, 326}, {327, 328}}-#define TXT_INV_QUILL {329, 330, 331, 332}-#define TXT_INV_TRINKETS {{333, 334}, {335, 336}, {337, 338}, {339, 340}}-#define SHOP_BACKBOARD {2962, 4.9000f, -0.3200f, 0.8667f, 1.0000f}-#define SHOP_MASK_TOP {2963, 5.1230f, 4.8800f, 1.0000f, 0.9013f}-#define SHOP_MASK_BOTTOM {2964, 5.1537f, -5.6200f, 1.0000f, 0.8820f}-#define SHOP_ARROW_U {2965, 1.7000f, 1.8900f, 1.0000f, 1.0000f}-#define SHOP_ARROW_D {2965, 1.7000f, -0.3800f, -1.0000f, 1.0000f}-#define SHOP_SELECTOR {2966, 1.7300f, 0.7600f, 0.9332f, 1.0000f}-#define SHOP_CONFIRM_GEO {2967, 4.2800f, 0.3400f, 1.0000f, 1.0000f}-#define SHOP_POINTER_L {2968, 3.6119f, -2.0798f, 1.0000f, 1.0000f}-#define SHOP_POINTER_R {2968, 6.6249f, -2.0798f, -1.0000f, 1.0000f}+#define TXT_INV_HEART {{295, 296}, {297, 298}, {299, 300}, {297, 301}, {297, 302}, {303, 304}}+#define TXT_INV_VESSEL {{295, 296}, {305, 306}, {307, 308}, {305, 309}, {310, 311}}+#define TXT_INV_FIXED {{312, 313}, {314, 315}, {316, 317}, {318, 319}}+#define TXT_INV_EQ {{320, 321}, {322, 323}, {324, 325}, {326, 327}, {328, 329}, {330, 331}, {332, 333}}+#define TXT_INV_QUILL {334, 335, 336, 337}+#define TXT_INV_TRINKETS {{338, 339}, {340, 341}, {342, 343}, {344, 345}}+#define SHOP_BACKBOARD {2990, 4.9000f, -0.3200f, 0.8667f, 1.0000f}+#define SHOP_MASK_TOP {2991, 5.1230f, 4.8800f, 1.0000f, 0.9013f}+#define SHOP_MASK_BOTTOM {2992, 5.1537f, -5.6200f, 1.0000f, 0.8820f}+#define SHOP_ARROW_U {2993, 1.7000f, 1.8900f, 1.0000f, 1.0000f}+#define SHOP_ARROW_D {2993, 1.7000f, -0.3800f, -1.0000f, 1.0000f}+#define SHOP_SELECTOR {2994, 1.7300f, 0.7600f, 0.9332f, 1.0000f}+#define SHOP_CONFIRM_GEO {2995, 4.2800f, 0.3400f, 1.0000f, 1.0000f}+#define SHOP_POINTER_L {2996, 3.6119f, -2.0798f, 1.0000f, 1.0000f}+#define SHOP_POINTER_R {2996, 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 342+#define TXT_KEY_BACK 347#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}}@@ -1204,7 +1212,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 {2969, 5.5100f, 2.5800f, 1.0000f, 1.0000f}+#define SHOP_PEG {2997, 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}@@ -1215,24 +1223,24 @@#define SHOP_ROW_TOP 4.9000f#define SHOP_ROW_BOTTOM -5.2500f#define SHOP_ARROW_BOB 0.1500f-#define TXT_SHOP_CTRL_BUY 345-#define TXT_SHOP_CTRL_EXIT 346-#define TXT_SHOP_CTRL_CONFIRM 347-#define TXT_SHOP_CTRL_CANCEL 348-#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 349-#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 350-#define TXT_SHOP_CHARM_TXT_NOTCHCOST 351-#define TXT_SHOP_YES 352-#define TXT_SHOP_NO 353+#define TXT_SHOP_CTRL_BUY 350+#define TXT_SHOP_CTRL_EXIT 351+#define TXT_SHOP_CTRL_CONFIRM 352+#define TXT_SHOP_CTRL_CANCEL 353+#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 354+#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 355+#define TXT_SHOP_CHARM_TXT_NOTCHCOST 356+#define TXT_SHOP_YES 357+#define TXT_SHOP_NO 358#define SHOP_DESC_BOTTOM -5.0500f-#define SHOP_ITEMS {{2971, 0.5714f, 354, 355, 150, 1, 125, -1, 0, 0}, {2971, 0.5714f, 354, 356, 500, 1, 126, 125, 0, 0}, {2972, 0.5714f, 357, 358, 550, 3, 127, -1, 0, 0}, {2973, 0.5714f, 359, 360, 950, 10, 128, -1, 0, 0}, {2974, 0.5714f, 361, 362, 300, 2, 37, -1, 0, 1}, {2975, 0.5714f, 363, 364, 200, 2, 40, -1, 0, 4}, {2976, 0.5714f, 365, 366, 1800, 0, 119, -1, 0, 0}, {2977, 0.5714f, 367, 368, 60, 11, 129, -1, 0, 0}, {2978, 0.5714f, 369, 370, 220, 2, 38, -1, 0, 2}, {2979, 0.5714f, 371, 372, 120, 0, 2, -1, 0, 0}, {2980, 0.5714f, 373, 374, 40, 9, 130, 10, 0, 0}, {2980, 0.5714f, 375, 376, 80, 9, 131, 28, 0, 0}, {2981, 0.5714f, 377, 378, 100, 16, 133, -1, 0, 0}, {2982, 0.5714f, 379, 380, 100, 16, 134, -1, 0, 0}, {2983, 0.5714f, 381, 382, 100, 16, 135, -1, 0, 0}, {2984, 0.5714f, 383, 384, 100, 16, 137, 147, 0, 0}, {2985, 0.5714f, 385, 386, 100, 16, 136, -1, 0, 0}, {2986, 0.5714f, 387, 388, 100, 17, 139, -1, 0, 0}, {2987, 0.5714f, 389, 390, 100, 17, 140, -1, 0, 0}, {2988, 0.5714f, 391, 392, 100, 17, 141, 14, 0, 0}, {2989, 0.5714f, 393, 394, 210, 17, 142, 14, 0, 0}, {2990, 0.5714f, 395, 396, 250, 2, 44, -1, 0, 8}, {2991, 0.5714f, 397, 398, 300, 2, 54, -1, 0, 18}, {2992, 0.5714f, 399, 400, 120, 2, 50, -1, 0, 14}, {2993, 0.5714f, 401, 402, 220, 2, 55, -1, 0, 19}, {2994, 0.5714f, 403, 404, 800, 2, 43, -1, 0, 7}, {2995, 0.5714f, 405, 406, 120, 8, 143, -1, 5, 0}, {2995, 0.5714f, 405, 406, 500, 8, 144, -1, 10, 0}, {2995, 0.5714f, 405, 406, 900, 8, 145, -1, 18, 0}, {2995, 0.5714f, 405, 407, 1400, 8, 146, -1, 25, 0}}-#define SHOP_FIRST {0, 8, 21, 30}-#define SHOP_ROW_GEO {2970, 1.4551f, 0.0000f, 1.0000f, 1.0000f}+#define SHOP_ITEMS {{2999, 0.5714f, 359, 360, 150, 1, 125, -1, 0, 0}, {2999, 0.5714f, 359, 361, 500, 1, 126, 125, 0, 0}, {3000, 0.5714f, 362, 363, 550, 3, 127, -1, 0, 0}, {3001, 0.5714f, 364, 365, 950, 10, 128, -1, 0, 0}, {3002, 0.5714f, 366, 367, 300, 2, 37, -1, 0, 1}, {3003, 0.5714f, 368, 369, 200, 2, 40, -1, 0, 4}, {3004, 0.5714f, 370, 371, 1800, 0, 119, -1, 0, 0}, {3005, 0.5714f, 372, 373, 60, 11, 129, -1, 0, 0}, {3006, 0.5714f, 374, 375, 220, 2, 38, -1, 0, 2}, {3007, 0.5714f, 376, 377, 120, 0, 2, -1, 0, 0}, {3008, 0.5714f, 378, 379, 40, 9, 130, 10, 0, 0}, {3008, 0.5714f, 380, 381, 80, 9, 131, 28, 0, 0}, {3008, 0.5714f, 382, 383, 100, 9, 178, 180, 0, 0}, {3009, 0.5714f, 384, 385, 100, 16, 133, -1, 0, 0}, {3010, 0.5714f, 386, 387, 100, 16, 134, -1, 0, 0}, {3011, 0.5714f, 388, 389, 100, 16, 135, -1, 0, 0}, {3012, 0.5714f, 390, 391, 100, 16, 137, 147, 0, 0}, {3013, 0.5714f, 392, 393, 100, 16, 136, -1, 0, 0}, {3014, 0.5714f, 394, 395, 100, 17, 139, -1, 0, 0}, {3015, 0.5714f, 396, 397, 100, 17, 140, -1, 0, 0}, {3016, 0.5714f, 398, 399, 100, 17, 141, 14, 0, 0}, {3017, 0.5714f, 400, 401, 210, 17, 142, 14, 0, 0}, {3018, 0.5714f, 402, 403, 250, 2, 44, -1, 0, 8}, {3019, 0.5714f, 404, 405, 300, 2, 54, -1, 0, 18}, {3020, 0.5714f, 406, 407, 120, 2, 50, -1, 0, 14}, {3021, 0.5714f, 408, 409, 220, 2, 55, -1, 0, 19}, {3022, 0.5714f, 410, 411, 800, 2, 43, -1, 0, 7}, {3023, 0.5714f, 412, 413, 120, 8, 143, -1, 5, 0}, {3023, 0.5714f, 412, 413, 500, 8, 144, -1, 10, 0}, {3023, 0.5714f, 412, 413, 900, 8, 145, -1, 18, 0}, {3023, 0.5714f, 412, 414, 1400, 8, 146, -1, 25, 0}}+#define SHOP_FIRST {0, 8, 22, 31}+#define SHOP_ROW_GEO {2998, 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 {409, 410, 411}+#define SHOP_NOSTOCK {416, 417, 418}#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}@@ -1243,81 +1251,81 @@#define STAG_N 4#define STAG_AT {0.3000f, 0.3000f}#define STAG_K 1.2646f-#define STAG_BACKING {2996, -0.4427f, 0.0000f, 1.0000f, 0.6408f}+#define STAG_BACKING {3024, -0.4427f, 0.0000f, 1.0000f, 0.6408f}#define STAG_BACKING_A 0.9020f-#define STAG_PIECES {{2997, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2998, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2999, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3000, 0.4147f, 1.5909f, 1.0000f, 1.0000f}, {3001, 3.2899f, -0.9763f, 1.0000f, 1.0000f}}+#define STAG_PIECES {{3025, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {3026, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {3027, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {3028, 0.4147f, 1.5909f, 1.0000f, 1.0000f}, {3029, 3.2899f, -0.9763f, 1.0000f, 1.0000f}}#define STAG_OPENED {-1, 155, 156, 171}#define STAG_MARKS {{2.9379f, 3.7471f}, {4.8742f, 2.0690f}, {-0.4360f, 2.7790f}, {3.5687f, -0.9763f}}#define STAG_SELECTOR {0.0000f, 0.0000f, 1.1797f, 1.2092f}-#define STAG_MAP_KNIGHT {3002, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define STAG_MAP_SHADOW {3003, 0.0110f, -0.0100f, 1.0000f, 0.9227f}+#define STAG_MAP_KNIGHT {3030, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define STAG_MAP_SHADOW {3031, 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 {3004, 2.8680f, 0.6180f, -1.0000f, 1.0000f}-#define STAG_POINTER_L {3004, -2.8680f, 0.6180f, 1.0000f, 1.0000f}+#define STAG_POINTER_R {3032, 2.8680f, 0.6180f, -1.0000f, 1.0000f}+#define STAG_POINTER_L {3032, -2.8680f, 0.6180f, 1.0000f, 1.0000f}#define STAG_ROW {-7.5992f, 3.9576f}-#define STAG_LIST_KNIGHT {3002, -10.5102f, 4.6056f, 1.0000f, 1.0000f}-#define STAG_DIVIDER {3005, -7.6003f, 5.2734f, -1.0000f, -0.8696f}+#define STAG_LIST_KNIGHT {3030, -10.5102f, 4.6056f, 1.0000f, 1.0000f}+#define STAG_DIVIDER {3033, -7.6003f, 5.2734f, -1.0000f, -0.8696f}#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}-#define TXT_STAG_STATIONS 412-#define TXT_STAG_NAMES {413, 373, 375, 414}+#define TXT_STAG_STATIONS 419+#define TXT_STAG_NAMES {420, 378, 380, 421}#define STAG_NAMES_STR {124, 123, 127, 126}#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 415+#define TXT_STAG_CTRL_TRAVEL 422#define STAG_T_ACT_CANCEL {11.1713f, -5.3525f, 15.3500f}#define STAG_KEY_CANCEL {11.7464f, -5.6213f}-#define TXT_STAG_CTRL_CANCEL 348+#define TXT_STAG_CTRL_CANCEL 353#define STAG_SCENES_STR {137, 136, 138, 139}#define STAG_SCENES_ROOM {4, 19, 36, 32812}-#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 419, 0x14u}, {2, 24, 130, -0.0400f, -7.8800f, 422, 0x400020u}, {26, 16, 131, 16.3100f, -7.8700f, 423, 0x40u}}-#define MAP_ROOMS {{0, 1, 3006, 3007, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 0, 3013, 3014, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 12, -1, -1, -1.5030f, 5.1050f, 0.0000f, 0.0000f, 0x000000, 0}, {1, 127, 3016, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 3017, 3018, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 19, 3019, -1, 1.4650f, 4.4640f, 0.6500f, 0.3100f, 0xB5DDFB, 0}, {1, 255, 3020, 3021, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 15, 3022, 3023, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 9, 3024, -1, -3.0980f, 6.4880f, 1.1110f, 0.4800f, 0xB5DDFB, 0}, {1, 10, 3026, 3027, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 25, 3028, -1, -0.6440f, 4.4430f, 0.7000f, 0.3700f, 0xB5DDFB, 0}, {1, 14, 3030, 3031, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 20, 3032, 3033, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 17, 3034, 3035, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 16, 3036, 3037, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3038, 3039, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3040, 3041, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 26, 3042, -1, -3.7180f, 5.7650f, 2.3517f, 0.4300f, 0xB5DDFB, 0}, {1, 13, 3044, 3045, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 24, 3046, 3047, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 8, 3048, 3049, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 11, 3050, -1, -1.5030f, 5.1050f, 0.8500f, 0.8900f, 0xB5DDFB, 0}, {1, 21, 3051, -1, 3.7290f, 3.4460f, 2.4100f, 0.6600f, 0xB5DDFB, 0}, {1, 18, 3053, 3054, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 6, 3055, 3056, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 5, 3057, 3058, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 3059, 3060, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 33, 3061, 3062, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 32, 3063, 3064, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 3065, 3066, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 35, 3067, -1, -12.3910f, 5.0270f, 0.5700f, 1.9700f, 0xCFFFC3, 0}, {2, 34, 3068, 3069, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3070, 3071, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 30, 3072, -1, -9.2170f, 5.6940f, 1.2300f, 0.4400f, 0xCFFFC3, 0}, {2, 36, 3073, -1, -12.9760f, 5.8120f, 0.6000f, 0.3000f, 0xCFFFC3, 0}, {2, 255, 3074, 3075, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3076, 3077, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 37, 3078, 3079, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 31, 3080, -1, -10.4130f, 5.6780f, 1.1700f, 0.5500f, 0xCFFFC3, 0}, {2, 29, 3081, 3082, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 28, 3083, 3084, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 27, 3085, 3086, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}-#define MAP_PINS {{0, 0, 3008, -2.0390f, 7.7500f, 133, -1}, {0, 0, 3009, -1.6430f, 7.7500f, 137, -1}, {0, 0, 3010, -2.4700f, 7.7500f, 135, 122}, {0, 0, 3011, -1.2540f, 7.7600f, 135, 123}, {1, 1, 3015, -6.2100f, 7.6800f, 134, -1}, {2, 1, 3015, -1.3150f, 5.0920f, 134, -1}, {5, 0, 3009, 1.2400f, 4.4520f, 137, -1}, {5, 0, 3008, 1.6210f, 4.4490f, 133, -1}, {8, 0, 3025, -3.0697f, 6.4597f, 135, -1}, {10, 0, 3008, -0.3430f, 4.4060f, 133, -1}, {10, 0, 3029, -0.7200f, 4.3930f, 136, -1}, {21, 0, 3008, -1.6940f, 5.0880f, 133, -1}, {22, 0, 3052, 4.5530f, 3.3700f, 135, 124}, {22, 0, 3008, 4.9480f, 3.3820f, 133, -1}, {27, 1, 3015, -10.9970f, 6.6240f, 134, -1}, {28, 0, 3008, -11.2580f, 4.9690f, 133, -1}, {34, 0, 3008, -12.8160f, 5.7890f, 133, -1}, {34, 0, 3009, -13.1960f, 5.7970f, 137, -1}, {40, 0, 3008, -7.6610f, 6.0700f, 133, -1}}-#define MAP_NEXT {{0, 3012, -1.0730f, 6.4850f, 180.0000f, 418, -1.0730f, 6.1870f, 1, -1}, {17, 3043, -5.2607f, 5.8454f, 90.0000f, 420, -5.5969f, 6.0434f, 2, 16}, {25, 3012, -1.0730f, 7.2500f, 0.0000f, 417, -1.0930f, 7.9120f, 1, -1}, {41, 3012, -4.5300f, 5.8450f, -90.0000f, 418, -4.1075f, 6.0470f, 0, 6}}-#define MAP_NAMES {{0, -1, 416, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 417, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 418, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {1, 21, 421, 3.4800f, 5.6971f, 0xB5DCFB, 1, 0}, {2, -1, 420, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}+#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 426, 0x14u}, {2, 24, 130, -0.0400f, -7.8800f, 429, 0x400020u}, {26, 16, 131, 16.3100f, -7.8700f, 430, 0x40u}}+#define MAP_ROOMS {{0, 1, 3034, 3035, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 0, 3041, 3042, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 12, -1, -1, -1.5030f, 5.1050f, 0.0000f, 0.0000f, 0x000000, 0}, {1, 127, 3044, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 3045, 3046, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 19, 3047, -1, 1.4650f, 4.4640f, 0.6500f, 0.3100f, 0xB5DDFB, 0}, {1, 255, 3048, 3049, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 15, 3050, 3051, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 9, 3052, -1, -3.0980f, 6.4880f, 1.1110f, 0.4800f, 0xB5DDFB, 0}, {1, 10, 3054, 3055, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 25, 3056, -1, -0.6440f, 4.4430f, 0.7000f, 0.3700f, 0xB5DDFB, 0}, {1, 14, 3058, 3059, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 20, 3060, 3061, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 17, 3062, 3063, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 16, 3064, 3065, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 3066, 3067, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 3068, 3069, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 26, 3070, -1, -3.7180f, 5.7650f, 2.3517f, 0.4300f, 0xB5DDFB, 0}, {1, 13, 3072, 3073, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 24, 3074, 3075, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 8, 3076, 3077, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 11, 3078, -1, -1.5030f, 5.1050f, 0.8500f, 0.8900f, 0xB5DDFB, 0}, {1, 21, 3079, -1, 3.7290f, 3.4460f, 2.4100f, 0.6600f, 0xB5DDFB, 0}, {1, 18, 3081, 3082, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 6, 3083, 3084, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 5, 3085, 3086, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 3087, 3088, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 33, 3089, 3090, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 32, 3091, 3092, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 3093, 3094, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 35, 3095, -1, -12.3910f, 5.0270f, 0.5700f, 1.9700f, 0xCFFFC3, 0}, {2, 34, 3096, 3097, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 3098, 3099, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 30, 3100, -1, -9.2170f, 5.6940f, 1.2300f, 0.4400f, 0xCFFFC3, 0}, {2, 36, 3101, -1, -12.9760f, 5.8120f, 0.6000f, 0.3000f, 0xCFFFC3, 0}, {2, 255, 3102, 3103, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 3104, 3105, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 37, 3106, 3107, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 31, 3108, -1, -10.4130f, 5.6780f, 1.1700f, 0.5500f, 0xCFFFC3, 0}, {2, 29, 3109, 3110, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 28, 3111, 3112, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 27, 3113, 3114, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}+#define MAP_PINS {{0, 0, 3036, -2.0390f, 7.7500f, 133, -1}, {0, 0, 3037, -1.6430f, 7.7500f, 137, -1}, {0, 0, 3038, -2.4700f, 7.7500f, 135, 122}, {0, 0, 3039, -1.2540f, 7.7600f, 135, 123}, {1, 1, 3043, -6.2100f, 7.6800f, 134, -1}, {2, 1, 3043, -1.3150f, 5.0920f, 134, -1}, {5, 0, 3037, 1.2400f, 4.4520f, 137, -1}, {5, 0, 3036, 1.6210f, 4.4490f, 133, -1}, {8, 0, 3053, -3.0697f, 6.4597f, 135, -1}, {10, 0, 3036, -0.3430f, 4.4060f, 133, -1}, {10, 0, 3057, -0.7200f, 4.3930f, 136, -1}, {21, 0, 3036, -1.6940f, 5.0880f, 133, -1}, {22, 0, 3080, 4.5530f, 3.3700f, 135, 124}, {22, 0, 3036, 4.9480f, 3.3820f, 133, -1}, {27, 1, 3043, -10.9970f, 6.6240f, 134, -1}, {28, 0, 3036, -11.2580f, 4.9690f, 133, -1}, {34, 0, 3036, -12.8160f, 5.7890f, 133, -1}, {34, 0, 3037, -13.1960f, 5.7970f, 137, -1}, {40, 0, 3036, -7.6610f, 6.0700f, 133, -1}}+#define MAP_NEXT {{0, 3040, -1.0730f, 6.4850f, 180.0000f, 425, -1.0730f, 6.1870f, 1, -1}, {17, 3071, -5.2607f, 5.8454f, 90.0000f, 427, -5.5969f, 6.0434f, 2, 16}, {25, 3040, -1.0730f, 7.2500f, 0.0000f, 424, -1.0930f, 7.9120f, 1, -1}, {41, 3040, -4.5300f, 5.8450f, -90.0000f, 425, -4.1075f, 6.0470f, 0, 6}}+#define MAP_NAMES {{0, -1, 423, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 424, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 425, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {1, 21, 428, 3.4800f, 5.6971f, 0xB5DCFB, 1, 0}, {2, -1, 427, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}#define MAP_QUICK_K 1.5500f-#define MAP_SHADE {{3087, 0.0055f, -0.0110f, 178}, {3088, 0.0000f, 0.0000f, 255}}-#define MAP_MARKERS {3089, 3090, 3091, 3092}+#define MAP_SHADE {{3115, 0.0055f, -0.0110f, 178}, {3116, 0.0000f, 0.0000f, 255}}+#define MAP_MARKERS {3117, 3118, 3119, 3120}#define MAP_COMPASS_K 0.7000f#define MAP_BG_A 0.4438f#define MAP_TITLE {0.0000f, 7.5363f}-#define MAP_TITLE_BACK {3093, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}-#define MAP_NO_MAP {3094, 0.0000f, 0.9400f}-#define MAP_NO_MAP_MSG {424, -0.0600f, -1.2932f}-#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 425, 3095, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}+#define MAP_TITLE_BACK {3121, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}+#define MAP_NO_MAP {3122, 0.0000f, 0.9400f}+#define MAP_NO_MAP_MSG {431, -0.0600f, -1.2932f}+#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 432, 3123, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}#define MAP_MSG_K 0.7000f#define FIRSTMAP_BG_A 0.6410f-#define FIRSTMAP_TEXTS {{426, 0.0000f, 5.0305f}, {182, 0.0000f, -0.8796f}, {427, 0.0000f, -3.2895f}, {428, 0.0000f, -4.6996f}}-#define FIRSTMAP_PIECES {{3096, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3097, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3098, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}-#define FIRSTMAP_KEY {429, 0.0900f, -2.3200f}-#define MAP_WIDE {{{3099, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 430, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3100, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 431, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3101, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 432, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}}+#define FIRSTMAP_TEXTS {{433, 0.0000f, 5.0305f}, {182, 0.0000f, -0.8796f}, {434, 0.0000f, -3.2895f}, {435, 0.0000f, -4.6996f}}+#define FIRSTMAP_PIECES {{3124, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {3125, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {3126, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}+#define FIRSTMAP_KEY {436, 0.0900f, -2.3200f}+#define MAP_WIDE {{{3127, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 437, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3128, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 438, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{3129, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 439, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}}#define MAP_WIDE_GREY 0x5C#define MAP_WIDE_NAME_GREY 0x5B#define MAP_WIDE_COMPASS_K 0.8700f#define MAP_ZOOM {0.2800f, -2.8000f, 0.4360f, 1.3000f}#define MAP_PAN {-1.4400f, 4.5500f, -8.6420f, -5.5800f}#define MAP_PAN_SPEED 8.0000f-#define MAP_PAN_ARROWS {{3102, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3102, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3102, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3102, 17.1900f, -7.1700f, 1.0f, -90.0000f}}-#define MAP_ACT_CONFIRM {{3103, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {433, 434, 434}}-#define MAP_ACT_MARKER {{3103, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {435, 436, 437}}-#define MAP_ACT_CANCEL {{3103, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {348, 348, 348}}-#define MAP_ACT_CHANGE {{3103, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {438, 438, 438}}-#define MAP_ACT_KEY {{3103, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {439, 440, 441}}-#define MAP_KEY_BB {3104, 13.6200f, 3.4200f, 0.3781f, 1.0000f}+#define MAP_PAN_ARROWS {{3130, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {3130, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {3130, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {3130, 17.1900f, -7.1700f, 1.0f, -90.0000f}}+#define MAP_ACT_CONFIRM {{3131, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {440, 441, 441}}+#define MAP_ACT_MARKER {{3131, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {442, 443, 444}}+#define MAP_ACT_CANCEL {{3131, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {353, 353, 353}}+#define MAP_ACT_CHANGE {{3131, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {445, 445, 445}}+#define MAP_ACT_KEY {{3131, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {446, 447, 448}}+#define MAP_KEY_BB {3132, 13.6200f, 3.4200f, 0.3781f, 1.0000f}#define MAP_KEY_STEP -0.8250f-#define MAP_KEY_ROWS {{{3105, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 442, {12.7550f, -1.5413f, 15.3500f}}, {{3106, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 443, {12.7550f, -1.5413f, 15.3500f}}, {{3107, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 444, {12.7550f, -1.5413f, 15.3500f}}, {{3108, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 445, {12.7550f, -1.5413f, 15.3500f}}, {{3109, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 446, {12.7550f, -1.5413f, 15.3500f}}}+#define MAP_KEY_ROWS {{{3133, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 449, {12.7550f, -1.5413f, 15.3500f}}, {{3134, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 450, {12.7550f, -1.5413f, 15.3500f}}, {{3135, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 451, {12.7550f, -1.5413f, 15.3500f}}, {{3136, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 452, {12.7550f, -1.5413f, 15.3500f}}, {{3137, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 453, {12.7550f, -1.5413f, 15.3500f}}}#define MAP_KEY_FLAGS {133, 134, 135, 136, 137}#define MAP_KEY_N 5-#define MAP_MM_PIECES {{3110, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3111, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3112, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3113, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}-#define MAP_MM_MARKERS {3114, 3115, 3116, 3117}+#define MAP_MM_PIECES {{3138, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {3139, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {3140, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {3141, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}+#define MAP_MM_MARKERS {3142, 3143, 3144, 3145}#define MAP_MM_AMOUNT {0.0000f, -0.6416f, 1.0614f}#define MAP_MM_ROW {0.0000f, 0.4400f, 1.9000f, 1.4333f, -12.8200f}-#define MAP_MM_PLACE {3118, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}+#define MAP_MM_PLACE {3146, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}#define MAP_MM_RADII 0.8900f#define MAP_MM_UI_PAUSE 0.2000f-#define TXT_KEY_SHIFT 447+#define TXT_KEY_SHIFT 454#define ROOM_ZONES {2, 4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 22, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6}#define MSG_FIREBALL 0#define MSG_DASH 1diff --git a/games/hollowknight/src/data_fw.bin b/games/hollowknight/src/data_fw.binindex 0641fc44..9605050b 100644Binary files a/games/hollowknight/src/data_fw.bin and b/games/hollowknight/src/data_fw.bin differdiff --git a/games/hollowknight/src/data_fw.h b/games/hollowknight/src/data_fw.hindex fa21fcbc..b6376589 100644--- a/games/hollowknight/src/data_fw.h+++ b/games/hollowknight/src/data_fw.h@@ -18,7 +18,7 @@#define SEC_HEADS 15#define SEC_VM 16#define SEC_VMDEF 17-#define NUM_ROOMS 7+#define NUM_ROOMS 14#define ROOM_BASE 38#define HK_PART_N 2#define CROSS_HOME_ROOM 0@@ -31,6 +31,13 @@#define ROOM_FUNGUS2_03 4#define ROOM_FUNGUS2_01 5#define ROOM_FUNGUS2_02 6+#define ROOM_FUNGUS2_18 7+#define ROOM_FUNGUS2_11 8+#define ROOM_FUNGUS2_12 9+#define ROOM_FUNGUS2_13 10+#define ROOM_FUNGUS2_14 11+#define ROOM_FUNGUS2_15 12+#define ROOM_FUNGUS2_31 13#define CLIP_KNIGHT_IDLE 0#define CLIP_KNIGHT_IDLE_HURT 1#define CLIP_KNIGHT_IDLE_WIND 2@@ -118,488 +125,536 @@#define CLIP_KNIGHT_DEATH_HEAD_CRACKED 84#define CLIP_KNIGHT_DREAMER_LAND 85#define CLIP_KNIGHT_SUPER_HARD_LAND 86-#define CLIP_GEOROCK_IDLE_1 87-#define CLIP_GEOROCK_GLEAM_1 88-#define CLIP_GEOROCK_BROKEN_1 89-#define CLIP_GEOROCK_IDLE_2 90-#define CLIP_GEOROCK_GLEAM_2 91-#define CLIP_GEOROCK_BROKEN_2 92-#define CLIP_CHEST_IDLE 93-#define CLIP_CHEST_OPEN 94-#define CLIP_CHEST_BURST 95-#define CLIP_CHEST_OPENED 96-#define CLIP_HUD_HEALTH_EMPTY 97-#define CLIP_HUD_HEALTH_IDLE 98-#define CLIP_HUD_HEALTH_BREAK 99-#define CLIP_HUD_HEALTH_REFILL 100-#define CLIP_HUD_HEALTH_APPEAR 101-#define CLIP_HUD_BLUE_APPEAR 102-#define CLIP_HUD_BLUE_IDLE 103-#define CLIP_HUD_BLUE_BREAK 104-#define CLIP_HUD_BLUE_BREAK_FAST 105-#define CLIP_HUD_HUD_FRAME 106-#define CLIP_HUD_HUD_FRAME_IDLE 107-#define CLIP_HUD_HUD_FRAME_CRACKAPPEAR 108-#define CLIP_HUD_HUD_FRAME_CRACKED 109-#define CLIP_HUD_COIN_APPEAR 110-#define CLIP_HUD_COIN_IDLE 111-#define CLIP_HUD_COIN_GET 112-#define CLIP_HUD_SOUL_BURST 113-#define CLIP_LIQUID_FILL 114-#define CLIP_LIQUID_IDLE 115-#define CLIP_LIQUID_SHRINK 116-#define CLIP_LIQUID_DRAIN 117-#define CLIP_GEO_SMALL_IDLE 118-#define CLIP_GEO_SMALL_AIR 119-#define CLIP_GEO_MED_IDLE 120-#define CLIP_GEO_MED_AIR 121-#define CLIP_GEO_LARGE_IDLE 122-#define CLIP_GEO_LARGE_AIR 123-#define CLIP_SHOPUI_SHOP_MENU_TOP_UP 124-#define CLIP_SHOPUI_SHOP_MENU_TOP_DOWN 125-#define CLIP_SHOPUI_SHOP_MENU_BOTTOM_UP 126-#define CLIP_SHOPUI_SHOP_MENU_BOTTOM_DOWN 127-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_UP 128-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_DOWN 129-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_UP 130-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_DOWN 131-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_UP 132-#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_DOWN 133-#define CLIP_HEARTUI_FLEUR_APPEAR 134-#define CLIP_HEARTUI_FLEUR_DISAPPEAR 135-#define CLIP_HEARTUI_GET_0 136-#define CLIP_HEARTUI_GET_1 137-#define CLIP_HEARTUI_GET_2 138-#define CLIP_HEARTUI_GET_3 139-#define CLIP_HEARTUI_GET_4 140-#define CLIP_HEARTUI_GOT_1 141-#define CLIP_HEARTUI_GOT_2 142-#define CLIP_HEARTUI_GOT_3 143-#define CLIP_HEARTUI_FUSE 144-#define CLIP_HEARTUI_HEAD_MOVE 145-#define CLIP_VESSELUI_GET_0 146-#define CLIP_VESSELUI_GET_1 147-#define CLIP_VESSELUI_GET_2 148-#define CLIP_VESSELUI_GET_3 149-#define CLIP_VESSELUI_GOT_1 150-#define CLIP_VESSELUI_GOT_2 151-#define CLIP_STAGUI_STAG_MAP_SELECTION_CURSOR 152-#define CLIP_STAGUI_STAG_BORDER_TOP_UP 153-#define CLIP_STAGUI_STAG_BORDER_TOP_DOWN 154-#define CLIP_STAGUI_STAG_BORDER_BOTTOM_UP 155-#define CLIP_STAGUI_STAG_BORDER_BOTTOM_DOWN 156-#define CLIP_MAPUI_IDLE 157-#define CLIP_MAPUI_WALK 158-#define CLIP_JOURNALMSG_MAP_WRITING 159-#define CLIP_JOURNALMSG_MAP_COMPLETE 160-#define CLIP_GEOBUG_LAMP_BUG_IDLE 161-#define CLIP_DIALOGUE_ARROW_UP 162-#define CLIP_DIALOGUE_ARROW_DOWN 163-#define CLIP_DIALOGUE_STOP_UP 164-#define CLIP_DIALOGUE_STOP_DOWN 165-#define CLIP_DIALOGUE_FLEUR_TOP_UP 166-#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 167-#define CLIP_DIALOGUE_FLEUR_BOT_UP 168-#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 169-#define CLIP_DIALOGUE_DREAM_UP 170-#define CLIP_DIALOGUE_DREAM_DOWN 171-#define CLIP_PROMPT_UP 172-#define CLIP_PROMPT_DOWN 173-#define CLIP_PROMPT_BLANK 174-#define CLIP_SHADE_IDLE 175-#define CLIP_SHADE_STARTLE 176-#define CLIP_SHADE_FLY 177-#define CLIP_SHADE_TURNTOFLY 178-#define CLIP_SHADE_TURNTOIDLE 179-#define CLIP_SHADE_SLASH_ANTIC 180-#define CLIP_SHADE_SLASH 181-#define CLIP_SHADE_SLASH_CD 182-#define CLIP_SHADE_SLASH_EFFECT 183-#define CLIP_SHADE_CAST_ANTIC 184-#define CLIP_SHADE_CAST_CHARGE 185-#define CLIP_SHADE_CAST 186-#define CLIP_SHADE_RETREAT_START 187-#define CLIP_SHADE_RETREAT_END 188-#define CLIP_SHADE_DEATH_START 189-#define CLIP_SHADE_DEATH 190-#define CLIP_SHADE_DEPART 191-#define CLIP_SHADE_APPEAR 192-#define CLIP_SHADE_FIREBALL 193-#define CLIP_SHADE_FIREBALL_END 194-#define CLIP_SHADE_CAST_RING 195-#define CLIP_SHADE_DEATH_GLOW 196-#define CLIP_CRAWLER_WALK 197-#define CLIP_CRAWLER_TURN 198-#define CLIP_CRAWLER_IDLE 199-#define CLIP_CRAWLER_DEATH_AIR 200-#define CLIP_CRAWLER_DEATH_LAND 201-#define CLIP_BUZZER_CHASE 202-#define CLIP_BUZZER_IDLE 203-#define CLIP_BUZZER_STARTLE 204-#define CLIP_BUZZER_DEATH_AIR 205-#define CLIP_BUZZER_DEATH_LAND 206-#define CLIP_BUZZER_FLY 207-#define CLIP_BUZZER_TURNTOFLY 208-#define CLIP_BUZZER_TURNTOIDLE 209-#define CLIP_TIKTIK_DEATH_AIR 210-#define CLIP_TIKTIK_DEATH_LAND 211-#define CLIP_TIKTIK_STUN 212-#define CLIP_TIKTIK_WALK 213-#define CLIP_GRUZZER_DEATH_AIR 214-#define CLIP_GRUZZER_DEATH_LAND 215-#define CLIP_GRUZZER_FLY 216-#define CLIP_ASPID_DEATH_AIR 217-#define CLIP_ASPID_FIRE_LONG 218-#define CLIP_ASPID_FLY 219-#define CLIP_ASPID_TURNTOFLY 220-#define CLIP_BALDUR_DEATH_AIR 221-#define CLIP_BALDUR_DEATH_LAND 222-#define CLIP_BALDUR_IDLE 223-#define CLIP_BALDUR_ROLL 224-#define CLIP_BALDUR_START 225-#define CLIP_BALDUR_STOP 226-#define CLIP_ELDERBALDUR_CLOSE1 227-#define CLIP_ELDERBALDUR_CLOSE2 228-#define CLIP_ELDERBALDUR_CLOSED 229-#define CLIP_ELDERBALDUR_DEATH 230-#define CLIP_ELDERBALDUR_DEATH_STUN 231-#define CLIP_ELDERBALDUR_HIT 232-#define CLIP_ELDERBALDUR_IDLE 233-#define CLIP_ELDERBALDUR_OPEN 234-#define CLIP_ELDERBALDUR_SHOOT_ANTIC 235-#define CLIP_ELDERBALDUR_SHOOT_CD 236-#define CLIP_HUSK_ATTACK_ANTICIPATE 237-#define CLIP_HUSK_ATTACK_COOLDOWN 238-#define CLIP_HUSK_ATTACK_LUNGE 239-#define CLIP_HUSK_DEATH_AIR 240-#define CLIP_HUSK_DEATH_LAND 241-#define CLIP_HUSK_IDLE 242-#define CLIP_HUSK_TURN 243-#define CLIP_HUSK_WALK 244-#define CLIP_BARGER_ATTACK_ANTICIPATE 245-#define CLIP_BARGER_ATTACK_COOLDOWN 246-#define CLIP_BARGER_ATTACK_LUNGE 247-#define CLIP_BARGER_DEATH_AIR 248-#define CLIP_BARGER_DEATH_LAND 249-#define CLIP_BARGER_IDLE 250-#define CLIP_BARGER_TURN 251-#define CLIP_BARGER_WALK 252-#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 253-#define CLIP_HORNHEAD_ATTACK_COOLDOWN 254-#define CLIP_HORNHEAD_ATTACK_LUNGE 255-#define CLIP_HORNHEAD_DEATH_AIR 256-#define CLIP_HORNHEAD_DEATH_LAND 257-#define CLIP_HORNHEAD_IDLE 258-#define CLIP_HORNHEAD_TURN 259-#define CLIP_HORNHEAD_WALK 260-#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 261-#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 262-#define CLIP_MOSSRUNNER_ATTACK_LUNGE 263-#define CLIP_MOSSRUNNER_DEATH_AIR 264-#define CLIP_MOSSRUNNER_DEATH_LAND 265-#define CLIP_MOSSRUNNER_IDLE 266-#define CLIP_MOSSRUNNER_TURN 267-#define CLIP_MOSSRUNNER_WALK 268-#define CLIP_LEAPER_ATTACK 269-#define CLIP_LEAPER_DEATH_AIR 270-#define CLIP_LEAPER_DEATH_LAND 271-#define CLIP_LEAPER_IDLE 272-#define CLIP_LEAPER_LAND 273-#define CLIP_LEAPER_TURN 274-#define CLIP_LEAPER_WALK 275-#define CLIP_GUARD_ANTICIPATE 276-#define CLIP_GUARD_ATTACK2 277-#define CLIP_GUARD_DEATH_AIR 278-#define CLIP_GUARD_DEATH_LAND 279-#define CLIP_GUARD_DORMANT 280-#define CLIP_GUARD_IDLE 281-#define CLIP_GUARD_RUN 282-#define CLIP_GUARD_STARTLE 283-#define CLIP_GUARD_STOMP_ANTIC 284-#define CLIP_GUARD_STOMP_JUMP 285-#define CLIP_GUARD_STOMP_LAND 286-#define CLIP_GUARD_STOP_RUN 287-#define CLIP_GUARD_STOP_WALK 288-#define CLIP_GUARD_SWIPE 289-#define CLIP_GUARD_TURN 290-#define CLIP_GUARD_WAKE 291-#define CLIP_GUARD_WALK 292-#define CLIP_FK_ATTACK 293-#define CLIP_FK_ATTACK_ANTIC 294-#define CLIP_FK_ATTACK_RECOVER 295-#define CLIP_FK_BLANK 296-#define CLIP_FK_BODY 297-#define CLIP_FK_DEATH_FALL 298-#define CLIP_FK_DEATH_HEAD_1 299-#define CLIP_FK_DEATH_HEAD_2 300-#define CLIP_FK_DEATH_LAND 301-#define CLIP_FK_DEATH_SPAZ 302-#define CLIP_FK_IDLE 303-#define CLIP_FK_JUMP 304-#define CLIP_FK_JUMP_ANTIC 305-#define CLIP_FK_JUMP_ATTACK_HIT_1 306-#define CLIP_FK_JUMP_ATTACK_HIT_2 307-#define CLIP_FK_JUMP_ATTACK_HIT_3 308-#define CLIP_FK_JUMP_ATTACK_UP 309-#define CLIP_FK_LAND 310-#define CLIP_FK_RAGE 311-#define CLIP_FK_RUN 312-#define CLIP_FK_RUN_ANTIC 313-#define CLIP_FK_STUN_HIT 314-#define CLIP_FK_STUN_OPEN 315-#define CLIP_FK_STUN_OPENED 316-#define CLIP_FK_STUN_RECOVER 317-#define CLIP_FK_STUN_ROLL 318-#define CLIP_FK_STUN_ROLL_END 319-#define CLIP_FK_TURN 320-#define CLIP_FKHEAD_DEATH_LAND 321-#define CLIP_FKHEAD_HEAD_HIT 322-#define CLIP_FKHEAD_HEAD_IDLE 323-#define CLIP_FKHEAD_HEAD_SPAZ 324-#define CLIP_HATCHER_DEATH_AIR 325-#define CLIP_HATCHER_DEATH_LAND 326-#define CLIP_HATCHER_FIRE 327-#define CLIP_HATCHER_FLY 328-#define CLIP_HATCHLING_FLY 329-#define CLIP_SLUG_BOUNCE 330-#define CLIP_SLUG_DEATH_AIR 331-#define CLIP_SLUG_DEATH_LAND 332-#define CLIP_SLUG_IDLE_TODOWN 333-#define CLIP_SLUG_IDLE_TOUP 334-#define CLIP_SLUG_IDLE_UP 335-#define CLIP_SLUG_RUN 336-#define CLIP_SLUG_STARTLE 337-#define CLIP_GFLY_BURST 338-#define CLIP_GFLY_CHARGE 339-#define CLIP_GFLY_CHARGE_ANTIC 340-#define CLIP_GFLY_CHARGE_RECOVER 341-#define CLIP_GFLY_DEATH 342-#define CLIP_GFLY_FALL 343-#define CLIP_GFLY_FLY 344-#define CLIP_GFLY_GURGLE_LOOP 345-#define CLIP_GFLY_GURGLE_ONCE 346-#define CLIP_GFLY_SLAM_DOWN 347-#define CLIP_GFLY_SLAM_END 348-#define CLIP_GFLY_SLAM_UP 349-#define CLIP_GFLY_SLEEP 350-#define CLIP_GFLY_STOP 351-#define CLIP_GFLY_WAKE 352-#define CLIP_GFLY_WIGGLE 353-#define CLIP_MOSSWALKER_APPEAR 354-#define CLIP_MOSSWALKER_BURY 355-#define CLIP_MOSSWALKER_DEATH_AIR 356-#define CLIP_MOSSWALKER_DEATH_LAND 357-#define CLIP_MOSSWALKER_SHAKE 358-#define CLIP_MOSSWALKER_TURN 359-#define CLIP_MOSSWALKER_WALK 360-#define CLIP_PIGEON_FLY 361-#define CLIP_PIGEON_IDLE_01 362-#define CLIP_PIGEON_IDLE_02 363-#define CLIP_PIGEON_IDLE_03 364-#define CLIP_PLANTTRAP_DEATH 365-#define CLIP_PLANTTRAP_IDLE 366-#define CLIP_PLANTTRAP_RETRACT 367-#define CLIP_PLANTTRAP_SNAP 368-#define CLIP_PLANTTRAP_SNAP_READY 369-#define CLIP_SHAKER_ATTACK 370-#define CLIP_SHAKER_DEATH_AIR 371-#define CLIP_SHAKER_DEATH_LAND 372-#define CLIP_SHAKER_IDLE 373-#define CLIP_SHAKER_TURN 374-#define CLIP_SHAKER_WALK 375-#define CLIP_MOSQUITO_ATTACK 376-#define CLIP_MOSQUITO_ATTACK_ANTIC 377-#define CLIP_MOSQUITO_DEATH_AIR 378-#define CLIP_MOSQUITO_DEATH_LAND 379-#define CLIP_MOSQUITO_IDLE 380-#define CLIP_MOSQUITO_STARTLE 381-#define CLIP_MOSQUITO_TURNTOIDLE 382-#define CLIP_FATFLY_ATTACK 383-#define CLIP_FATFLY_DEATH_AIR 384-#define CLIP_FATFLY_DEATH_LAND 385-#define CLIP_FATFLY_FLY 386-#define CLIP_MOSSCHARGER_APPEAR 387-#define CLIP_MOSSCHARGER_CHARGE 388-#define CLIP_MOSSCHARGER_DEATH_AIR 389-#define CLIP_MOSSCHARGER_DEATH_LAND 390-#define CLIP_MOSSCHARGER_DISAPPEAR 391-#define CLIP_MOSSCHARGER_ESCAPE 392-#define CLIP_MOSSCHARGER_GET_UP 393-#define CLIP_MOSSCHARGER_STUN 394-#define CLIP_MOSSCHARGER_TURNRUN 395-#define CLIP_MOSSKNIGHT_DEATH_AIR 396-#define CLIP_MOSSKNIGHT_DEATH_LAND 397-#define CLIP_MOSSKNIGHT_DORMANT_1 398-#define CLIP_MOSSKNIGHT_DORMANT_2 399-#define CLIP_MOSSKNIGHT_EVADE 400-#define CLIP_MOSSKNIGHT_IDLE 401-#define CLIP_MOSSKNIGHT_SHAKE 402-#define CLIP_MOSSKNIGHT_SHIELD_FRONT 403-#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 404-#define CLIP_MOSSKNIGHT_SHIELD_TOP 405-#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 406-#define CLIP_MOSSKNIGHT_SHOOT 407-#define CLIP_MOSSKNIGHT_SHOOT_END 408-#define CLIP_MOSSKNIGHT_SLASH 409-#define CLIP_MOSSKNIGHT_SLASH_2 410-#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 411-#define CLIP_MOSSKNIGHT_SLASH_EFFECT 412-#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 413-#define CLIP_MOSSKNIGHT_SLASH_END 414-#define CLIP_MOSSKNIGHT_SLASH_QUICK 415-#define CLIP_MOSSKNIGHT_TURN 416-#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 417-#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 418-#define CLIP_MOSSKNIGHT_WAKE 419-#define CLIP_MOSSKNIGHT_WALK 420-#define CLIP_HORNET_A_DASH 421-#define CLIP_HORNET_A_DASH_ANTIC 422-#define CLIP_HORNET_AIR_DASH_EFFECT 423-#define CLIP_HORNET_DEATH_AIR 424-#define CLIP_HORNET_EVADE 425-#define CLIP_HORNET_EVADE_ANTIC 426-#define CLIP_HORNET_FALL 427-#define CLIP_HORNET_FLASH 428-#define CLIP_HORNET_FLOURISH 429-#define CLIP_HORNET_G_DASH 430-#define CLIP_HORNET_G_DASH_ANTIC 431-#define CLIP_HORNET_G_DASH_EFFECT 432-#define CLIP_HORNET_G_DASH_RECOVER1 433-#define CLIP_HORNET_G_DASH_RECOVER2 434-#define CLIP_HORNET_HARD_LAND 435-#define CLIP_HORNET_IDLE 436-#define CLIP_HORNET_JUMP 437-#define CLIP_HORNET_JUMP_ANTIC 438-#define CLIP_HORNET_LAND 439-#define CLIP_HORNET_NEEDLE 440-#define CLIP_HORNET_NEEDLE_THREAD 441-#define CLIP_HORNET_RUN 442-#define CLIP_HORNET_SPHERE_ANTIC_A 443-#define CLIP_HORNET_SPHERE_ANTIC_G 444-#define CLIP_HORNET_SPHERE_ATTACK 445-#define CLIP_HORNET_SPHERE_BALL 446-#define CLIP_HORNET_SPHERE_RECOVER_A 447-#define CLIP_HORNET_SPHERE_RECOVER_G 448-#define CLIP_HORNET_STUN 449-#define CLIP_HORNET_STUN_AIR 450-#define CLIP_HORNET_THROW 451-#define CLIP_HORNET_THROW_ANTIC 452-#define CLIP_HORNET_THROW_EFFECT 453-#define CLIP_HORNET_THROW_RECOVER 454-#define CLIP_HORNET_WALL_IMPACT 455-#define CLIP_HORNET_WOUNDED 456-#define CLIP_MENDER_DEATH_AIR 457-#define CLIP_MENDER_DEATH_LAND 458-#define CLIP_MENDER_FLY 459-#define CLIP_MENDER_IDLE 460-#define CLIP_MENDER_STARTLE 461-#define CLIP_FUNGLING_DEATH 462-#define CLIP_FUNGLING_IDLE 463-#define CLIP_FUNGLING_TURNTOIDLE 464-#define CLIP_AMBLOOM_DEATH_AIR 465-#define CLIP_AMBLOOM_DEATH_LAND 466-#define CLIP_AMBLOOM_TURN 467-#define CLIP_AMBLOOM_WALK 468-#define CLIP_FUNGOON_DEATH 469-#define CLIP_FUNGOON_EFFECT 470-#define CLIP_FUNGOON_FLOAT 471-#define CLIP_FUNGOON_SPIT 472-#define CLIP_FUNGOON_SPIT_ANTIC 473-#define CLIP_FUNGOON_SPIT_RECOVER 474-#define CLIP_SHRUMELING_DEATH_AIR 475-#define CLIP_SHRUMELING_DEATH_LAND 476-#define CLIP_SHRUMELING_IDLE 477-#define CLIP_SHRUMELING_MINI_REST_1 478-#define CLIP_SHRUMELING_MINI_REST_2 479-#define CLIP_SHRUMELING_MINI_REST_3 480-#define CLIP_SHRUMELING_MINI_REST_TO_WAKE_1 481-#define CLIP_SHRUMELING_MINI_REST_TO_WAKE_2 482-#define CLIP_SHRUMELING_MINI_REST_TO_WAKE_3 483-#define CLIP_SHRUMELING_RUN 484-#define CLIP_SHRUMELING_STARTLE 485-#define CLIP_FUNGUSHUSK_ATTACK 486-#define CLIP_FUNGUSHUSK_DEATH_AIR 487-#define CLIP_FUNGUSHUSK_DEATH_LAND 488-#define CLIP_FUNGUSHUSK_IDLE 489-#define CLIP_FUNGUSHUSK_TURN 490-#define CLIP_FUNGUSHUSK_WALK 491-#define CLIP_OGRE_ANTIC 492-#define CLIP_OGRE_BOUNCE 493-#define CLIP_OGRE_DEATH_AIR 494-#define CLIP_OGRE_RUN 495-#define CLIP_OGRE_SLEEP 496-#define CLIP_OGRE_SMASH_LOOP 497-#define CLIP_OGRE_SMASH_TO_RUN 498-#define CLIP_OGRE_SPIT 499-#define CLIP_OGRE_TURN 500-#define CLIP_OGRE_WAKE 501-#define CLIP_SPORG_ATTACK 502-#define CLIP_SPORG_DEATH 503-#define CLIP_SPORG_EXPLODE 504-#define CLIP_SPORG_IDLE_1 505-#define CLIP_SPORG_IDLE_2 506-#define CLIP_SPORG_SLEEP 507-#define CLIP_SPORG_SLEEP_TO_IDLE 508-#define CLIP_BGATE_BG_OPENED 509-#define CLIP_BGATE_BG_CLOSE_1 510-#define CLIP_BGATE_BG_CLOSE_2 511-#define CLIP_BGATE_BG_OPEN 512-#define CLIP_BGATE_BG_CLOSED 513-#define CLIP_BGATE_BONE_GATE_OPENED 514-#define CLIP_BGATE_BONE_GATE_CLOSE 515-#define CLIP_BGATE_BONE_GATE_CLOSED 516-#define CLIP_BGATE_BONE_GATE_OPEN 517-#define CLIP_COCOON_COCOON_IDLE 518-#define CLIP_COCOON_COCOON_SWEAT 519-#define CLIP_COCOON_SCUTTLER_LAND 520-#define CLIP_COCOON_SCUTTLER_RUN 521-#define CLIP_FX_SPLAT 522-#define CLIP_FX_SPLAT2 523-#define CLIP_FX_IMPACT_LINES 524-#define CLIP_FIREBALL_BLAST 525-#define CLIP_FIREBALL_BALL 526-#define CLIP_FIREBALL_BALL_END 527-#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 528-#define CLIP_DRIP_IDLE 529-#define CLIP_DRIP_DRIP 530-#define CLIP_DRIP_FALL 531-#define CLIP_DRIP_IMPACT 532-#define CLIP_HORNETCS_IDLE 533-#define CLIP_HORNETCS_JUMP_FULL 534-#define CLIP_HORNETCS_THROW_SIDE_START 535-#define CLIP_HORNETCS_THROW_SIDE 536-#define CLIP_HORNETCS_HARPOON_SIDE 537-#define CLIP_HORNETCS_THREAD_1 538-#define CLIP_HORNETCS_POINT 539-#define CLIP_HORNETCS_EVADE_ANTIC 540-#define CLIP_HORNETCS_EVADE 541-#define CLIP_HORNETCS_SOFT_LAND 542-#define CLIP_HORNETCS_TURN 543-#define CLIP_HORNETCS_RUN 544-#define CLIP_BULLET_IDLE 545-#define CLIP_BULLET_IMPACT 546-#define CLIP_BULLET_SHOCKWAVE_SPURT 547-#define CLIP_GLOB_IDLE 548-#define CLIP_GLOB_LAND 549-#define CLIP_VM0_ARRIVE 550-#define CLIP_VM0_ARRIVE_SMOKE 551-#define CLIP_VM0_IDLE 552-#define CLIP_VM1_BELL_IDLE 553-#define CLIP_VM1_BELL_RING_R 554-#define CLIP_VM1_BELL_STAND 555-#define CLIP_VM1_BELL_STAND_APPEAR 556-#define CLIP_VM1_BOX_DISAPPEAR 557-#define CLIP_VM1_BOX_IDLE 558-#define CLIP_VM1_FRONT 559-#define CLIP_VM1_GRATE_DISAPPEAR 560-#define CLIP_VM1_GRATE_IDLE 561-#define SPRITE_HERO_LIGHT 2434-#define SPRITE_DIALOGUE_BACKBOARD 2435-#define SPRITE_PROMPT_SHADOW 2436-#define SPRITE_CORPSE_NAIL 2437-#define SPRITE_FK_BARREL 2438-#define SPRITE_FK_STAFF 2439-#define SPRITE_DIGIT0 2697+#define CLIP_KNIGHT_WALL_SLIDE 87+#define CLIP_KNIGHT_WALLJUMP 88+#define CLIP_KNIGHT_WALL_SLASH 89+#define CLIP_KNIGHT_WALLJUMP_PUFF 90+#define CLIP_KNIGHT_SLASHEFFECT_M 91+#define CLIP_KNIGHT_SLASHEFFECTALT_M 92+#define CLIP_KNIGHT_UPSLASHEFFECT_M 93+#define CLIP_KNIGHT_DOWNSLASHEFFECT_M 94+#define CLIP_GEOROCK_IDLE_1 95+#define CLIP_GEOROCK_GLEAM_1 96+#define CLIP_GEOROCK_BROKEN_1 97+#define CLIP_GEOROCK_IDLE_2 98+#define CLIP_GEOROCK_GLEAM_2 99+#define CLIP_GEOROCK_BROKEN_2 100+#define CLIP_CHEST_IDLE 101+#define CLIP_CHEST_OPEN 102+#define CLIP_CHEST_BURST 103+#define CLIP_CHEST_OPENED 104+#define CLIP_HUD_HEALTH_EMPTY 105+#define CLIP_HUD_HEALTH_IDLE 106+#define CLIP_HUD_HEALTH_BREAK 107+#define CLIP_HUD_HEALTH_REFILL 108+#define CLIP_HUD_HEALTH_APPEAR 109+#define CLIP_HUD_BLUE_APPEAR 110+#define CLIP_HUD_BLUE_IDLE 111+#define CLIP_HUD_BLUE_BREAK 112+#define CLIP_HUD_BLUE_BREAK_FAST 113+#define CLIP_HUD_HUD_FRAME 114+#define CLIP_HUD_HUD_FRAME_IDLE 115+#define CLIP_HUD_HUD_FRAME_CRACKAPPEAR 116+#define CLIP_HUD_HUD_FRAME_CRACKED 117+#define CLIP_HUD_COIN_APPEAR 118+#define CLIP_HUD_COIN_IDLE 119+#define CLIP_HUD_COIN_GET 120+#define CLIP_HUD_SOUL_BURST 121+#define CLIP_LIQUID_FILL 122+#define CLIP_LIQUID_IDLE 123+#define CLIP_LIQUID_SHRINK 124+#define CLIP_LIQUID_DRAIN 125+#define CLIP_GEO_SMALL_IDLE 126+#define CLIP_GEO_SMALL_AIR 127+#define CLIP_GEO_MED_IDLE 128+#define CLIP_GEO_MED_AIR 129+#define CLIP_GEO_LARGE_IDLE 130+#define CLIP_GEO_LARGE_AIR 131+#define CLIP_SHOPUI_SHOP_MENU_TOP_UP 132+#define CLIP_SHOPUI_SHOP_MENU_TOP_DOWN 133+#define CLIP_SHOPUI_SHOP_MENU_BOTTOM_UP 134+#define CLIP_SHOPUI_SHOP_MENU_BOTTOM_DOWN 135+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_UP 136+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLY_DOWN 137+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_UP 138+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_MAPPERWIFE_DOWN 139+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_UP 140+#define CLIP_SHOPUI_SHOP_FIGUREHEAD_SLUG_DOWN 141+#define CLIP_HEARTUI_FLEUR_APPEAR 142+#define CLIP_HEARTUI_FLEUR_DISAPPEAR 143+#define CLIP_HEARTUI_GET_0 144+#define CLIP_HEARTUI_GET_1 145+#define CLIP_HEARTUI_GET_2 146+#define CLIP_HEARTUI_GET_3 147+#define CLIP_HEARTUI_GET_4 148+#define CLIP_HEARTUI_GOT_1 149+#define CLIP_HEARTUI_GOT_2 150+#define CLIP_HEARTUI_GOT_3 151+#define CLIP_HEARTUI_FUSE 152+#define CLIP_HEARTUI_HEAD_MOVE 153+#define CLIP_VESSELUI_GET_0 154+#define CLIP_VESSELUI_GET_1 155+#define CLIP_VESSELUI_GET_2 156+#define CLIP_VESSELUI_GET_3 157+#define CLIP_VESSELUI_GOT_1 158+#define CLIP_VESSELUI_GOT_2 159+#define CLIP_STAGUI_STAG_MAP_SELECTION_CURSOR 160+#define CLIP_STAGUI_STAG_BORDER_TOP_UP 161+#define CLIP_STAGUI_STAG_BORDER_TOP_DOWN 162+#define CLIP_STAGUI_STAG_BORDER_BOTTOM_UP 163+#define CLIP_STAGUI_STAG_BORDER_BOTTOM_DOWN 164+#define CLIP_MAPUI_IDLE 165+#define CLIP_MAPUI_WALK 166+#define CLIP_JOURNALMSG_MAP_WRITING 167+#define CLIP_JOURNALMSG_MAP_COMPLETE 168+#define CLIP_GEOBUG_LAMP_BUG_IDLE 169+#define CLIP_DIALOGUE_ARROW_UP 170+#define CLIP_DIALOGUE_ARROW_DOWN 171+#define CLIP_DIALOGUE_STOP_UP 172+#define CLIP_DIALOGUE_STOP_DOWN 173+#define CLIP_DIALOGUE_FLEUR_TOP_UP 174+#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 175+#define CLIP_DIALOGUE_FLEUR_BOT_UP 176+#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 177+#define CLIP_DIALOGUE_DREAM_UP 178+#define CLIP_DIALOGUE_DREAM_DOWN 179+#define CLIP_PROMPT_BLANK 180+#define CLIP_PROMPT_DOWN 181+#define CLIP_PROMPT_ENTER_DOWN 182+#define CLIP_PROMPT_ENTER_IDLE 183+#define CLIP_PROMPT_ENTER_UP 184+#define CLIP_PROMPT_IDLE 185+#define CLIP_PROMPT_LISTEN_DOWN 186+#define CLIP_PROMPT_LISTEN_IDLE 187+#define CLIP_PROMPT_LISTEN_UP 188+#define CLIP_PROMPT_UP 189+#define CLIP_SHADE_IDLE 190+#define CLIP_SHADE_STARTLE 191+#define CLIP_SHADE_FLY 192+#define CLIP_SHADE_TURNTOFLY 193+#define CLIP_SHADE_TURNTOIDLE 194+#define CLIP_SHADE_SLASH_ANTIC 195+#define CLIP_SHADE_SLASH 196+#define CLIP_SHADE_SLASH_CD 197+#define CLIP_SHADE_SLASH_EFFECT 198+#define CLIP_SHADE_CAST_ANTIC 199+#define CLIP_SHADE_CAST_CHARGE 200+#define CLIP_SHADE_CAST 201+#define CLIP_SHADE_RETREAT_START 202+#define CLIP_SHADE_RETREAT_END 203+#define CLIP_SHADE_DEATH_START 204+#define CLIP_SHADE_DEATH 205+#define CLIP_SHADE_DEPART 206+#define CLIP_SHADE_APPEAR 207+#define CLIP_SHADE_FIREBALL 208+#define CLIP_SHADE_FIREBALL_END 209+#define CLIP_SHADE_CAST_RING 210+#define CLIP_SHADE_DEATH_GLOW 211+#define CLIP_CRAWLER_WALK 212+#define CLIP_CRAWLER_TURN 213+#define CLIP_CRAWLER_IDLE 214+#define CLIP_CRAWLER_DEATH_AIR 215+#define CLIP_CRAWLER_DEATH_LAND 216+#define CLIP_BUZZER_CHASE 217+#define CLIP_BUZZER_IDLE 218+#define CLIP_BUZZER_STARTLE 219+#define CLIP_BUZZER_DEATH_AIR 220+#define CLIP_BUZZER_DEATH_LAND 221+#define CLIP_BUZZER_FLY 222+#define CLIP_BUZZER_TURNTOFLY 223+#define CLIP_BUZZER_TURNTOIDLE 224+#define CLIP_TIKTIK_DEATH_AIR 225+#define CLIP_TIKTIK_DEATH_LAND 226+#define CLIP_TIKTIK_STUN 227+#define CLIP_TIKTIK_WALK 228+#define CLIP_GRUZZER_DEATH_AIR 229+#define CLIP_GRUZZER_DEATH_LAND 230+#define CLIP_GRUZZER_FLY 231+#define CLIP_ASPID_DEATH_AIR 232+#define CLIP_ASPID_FIRE_LONG 233+#define CLIP_ASPID_FLY 234+#define CLIP_ASPID_TURNTOFLY 235+#define CLIP_BALDUR_DEATH_AIR 236+#define CLIP_BALDUR_DEATH_LAND 237+#define CLIP_BALDUR_IDLE 238+#define CLIP_BALDUR_ROLL 239+#define CLIP_BALDUR_START 240+#define CLIP_BALDUR_STOP 241+#define CLIP_ELDERBALDUR_CLOSE1 242+#define CLIP_ELDERBALDUR_CLOSE2 243+#define CLIP_ELDERBALDUR_CLOSED 244+#define CLIP_ELDERBALDUR_DEATH 245+#define CLIP_ELDERBALDUR_DEATH_STUN 246+#define CLIP_ELDERBALDUR_HIT 247+#define CLIP_ELDERBALDUR_IDLE 248+#define CLIP_ELDERBALDUR_OPEN 249+#define CLIP_ELDERBALDUR_SHOOT_ANTIC 250+#define CLIP_ELDERBALDUR_SHOOT_CD 251+#define CLIP_HUSK_ATTACK_ANTICIPATE 252+#define CLIP_HUSK_ATTACK_COOLDOWN 253+#define CLIP_HUSK_ATTACK_LUNGE 254+#define CLIP_HUSK_DEATH_AIR 255+#define CLIP_HUSK_DEATH_LAND 256+#define CLIP_HUSK_IDLE 257+#define CLIP_HUSK_TURN 258+#define CLIP_HUSK_WALK 259+#define CLIP_BARGER_ATTACK_ANTICIPATE 260+#define CLIP_BARGER_ATTACK_COOLDOWN 261+#define CLIP_BARGER_ATTACK_LUNGE 262+#define CLIP_BARGER_DEATH_AIR 263+#define CLIP_BARGER_DEATH_LAND 264+#define CLIP_BARGER_IDLE 265+#define CLIP_BARGER_TURN 266+#define CLIP_BARGER_WALK 267+#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 268+#define CLIP_HORNHEAD_ATTACK_COOLDOWN 269+#define CLIP_HORNHEAD_ATTACK_LUNGE 270+#define CLIP_HORNHEAD_DEATH_AIR 271+#define CLIP_HORNHEAD_DEATH_LAND 272+#define CLIP_HORNHEAD_IDLE 273+#define CLIP_HORNHEAD_TURN 274+#define CLIP_HORNHEAD_WALK 275+#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 276+#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 277+#define CLIP_MOSSRUNNER_ATTACK_LUNGE 278+#define CLIP_MOSSRUNNER_DEATH_AIR 279+#define CLIP_MOSSRUNNER_DEATH_LAND 280+#define CLIP_MOSSRUNNER_IDLE 281+#define CLIP_MOSSRUNNER_TURN 282+#define CLIP_MOSSRUNNER_WALK 283+#define CLIP_LEAPER_ATTACK 284+#define CLIP_LEAPER_DEATH_AIR 285+#define CLIP_LEAPER_DEATH_LAND 286+#define CLIP_LEAPER_IDLE 287+#define CLIP_LEAPER_LAND 288+#define CLIP_LEAPER_TURN 289+#define CLIP_LEAPER_WALK 290+#define CLIP_GUARD_ANTICIPATE 291+#define CLIP_GUARD_ATTACK2 292+#define CLIP_GUARD_DEATH_AIR 293+#define CLIP_GUARD_DEATH_LAND 294+#define CLIP_GUARD_DORMANT 295+#define CLIP_GUARD_IDLE 296+#define CLIP_GUARD_RUN 297+#define CLIP_GUARD_STARTLE 298+#define CLIP_GUARD_STOMP_ANTIC 299+#define CLIP_GUARD_STOMP_JUMP 300+#define CLIP_GUARD_STOMP_LAND 301+#define CLIP_GUARD_STOP_RUN 302+#define CLIP_GUARD_STOP_WALK 303+#define CLIP_GUARD_SWIPE 304+#define CLIP_GUARD_TURN 305+#define CLIP_GUARD_WAKE 306+#define CLIP_GUARD_WALK 307+#define CLIP_FK_ATTACK 308+#define CLIP_FK_ATTACK_ANTIC 309+#define CLIP_FK_ATTACK_RECOVER 310+#define CLIP_FK_BLANK 311+#define CLIP_FK_BODY 312+#define CLIP_FK_DEATH_FALL 313+#define CLIP_FK_DEATH_HEAD_1 314+#define CLIP_FK_DEATH_HEAD_2 315+#define CLIP_FK_DEATH_LAND 316+#define CLIP_FK_DEATH_SPAZ 317+#define CLIP_FK_IDLE 318+#define CLIP_FK_JUMP 319+#define CLIP_FK_JUMP_ANTIC 320+#define CLIP_FK_JUMP_ATTACK_HIT_1 321+#define CLIP_FK_JUMP_ATTACK_HIT_2 322+#define CLIP_FK_JUMP_ATTACK_HIT_3 323+#define CLIP_FK_JUMP_ATTACK_UP 324+#define CLIP_FK_LAND 325+#define CLIP_FK_RAGE 326+#define CLIP_FK_RUN 327+#define CLIP_FK_RUN_ANTIC 328+#define CLIP_FK_STUN_HIT 329+#define CLIP_FK_STUN_OPEN 330+#define CLIP_FK_STUN_OPENED 331+#define CLIP_FK_STUN_RECOVER 332+#define CLIP_FK_STUN_ROLL 333+#define CLIP_FK_STUN_ROLL_END 334+#define CLIP_FK_TURN 335+#define CLIP_FKHEAD_DEATH_LAND 336+#define CLIP_FKHEAD_HEAD_HIT 337+#define CLIP_FKHEAD_HEAD_IDLE 338+#define CLIP_FKHEAD_HEAD_SPAZ 339+#define CLIP_HATCHER_DEATH_AIR 340+#define CLIP_HATCHER_DEATH_LAND 341+#define CLIP_HATCHER_FIRE 342+#define CLIP_HATCHER_FLY 343+#define CLIP_HATCHLING_FLY 344+#define CLIP_SLUG_BOUNCE 345+#define CLIP_SLUG_DEATH_AIR 346+#define CLIP_SLUG_DEATH_LAND 347+#define CLIP_SLUG_IDLE_TODOWN 348+#define CLIP_SLUG_IDLE_TOUP 349+#define CLIP_SLUG_IDLE_UP 350+#define CLIP_SLUG_RUN 351+#define CLIP_SLUG_STARTLE 352+#define CLIP_GFLY_BURST 353+#define CLIP_GFLY_CHARGE 354+#define CLIP_GFLY_CHARGE_ANTIC 355+#define CLIP_GFLY_CHARGE_RECOVER 356+#define CLIP_GFLY_DEATH 357+#define CLIP_GFLY_FALL 358+#define CLIP_GFLY_FLY 359+#define CLIP_GFLY_GURGLE_LOOP 360+#define CLIP_GFLY_GURGLE_ONCE 361+#define CLIP_GFLY_SLAM_DOWN 362+#define CLIP_GFLY_SLAM_END 363+#define CLIP_GFLY_SLAM_UP 364+#define CLIP_GFLY_SLEEP 365+#define CLIP_GFLY_STOP 366+#define CLIP_GFLY_WAKE 367+#define CLIP_GFLY_WIGGLE 368+#define CLIP_MOSSWALKER_APPEAR 369+#define CLIP_MOSSWALKER_BURY 370+#define CLIP_MOSSWALKER_DEATH_AIR 371+#define CLIP_MOSSWALKER_DEATH_LAND 372+#define CLIP_MOSSWALKER_SHAKE 373+#define CLIP_MOSSWALKER_TURN 374+#define CLIP_MOSSWALKER_WALK 375+#define CLIP_PIGEON_FLY 376+#define CLIP_PIGEON_IDLE_01 377+#define CLIP_PIGEON_IDLE_02 378+#define CLIP_PIGEON_IDLE_03 379+#define CLIP_PLANTTRAP_DEATH 380+#define CLIP_PLANTTRAP_IDLE 381+#define CLIP_PLANTTRAP_RETRACT 382+#define CLIP_PLANTTRAP_SNAP 383+#define CLIP_PLANTTRAP_SNAP_READY 384+#define CLIP_SHAKER_ATTACK 385+#define CLIP_SHAKER_DEATH_AIR 386+#define CLIP_SHAKER_DEATH_LAND 387+#define CLIP_SHAKER_IDLE 388+#define CLIP_SHAKER_TURN 389+#define CLIP_SHAKER_WALK 390+#define CLIP_MOSQUITO_ATTACK 391+#define CLIP_MOSQUITO_ATTACK_ANTIC 392+#define CLIP_MOSQUITO_DEATH_AIR 393+#define CLIP_MOSQUITO_DEATH_LAND 394+#define CLIP_MOSQUITO_IDLE 395+#define CLIP_MOSQUITO_STARTLE 396+#define CLIP_MOSQUITO_TURNTOIDLE 397+#define CLIP_FATFLY_ATTACK 398+#define CLIP_FATFLY_DEATH_AIR 399+#define CLIP_FATFLY_DEATH_LAND 400+#define CLIP_FATFLY_FLY 401+#define CLIP_MOSSCHARGER_APPEAR 402+#define CLIP_MOSSCHARGER_CHARGE 403+#define CLIP_MOSSCHARGER_DEATH_AIR 404+#define CLIP_MOSSCHARGER_DEATH_LAND 405+#define CLIP_MOSSCHARGER_DISAPPEAR 406+#define CLIP_MOSSCHARGER_ESCAPE 407+#define CLIP_MOSSCHARGER_GET_UP 408+#define CLIP_MOSSCHARGER_STUN 409+#define CLIP_MOSSCHARGER_TURNRUN 410+#define CLIP_MOSSKNIGHT_DEATH_AIR 411+#define CLIP_MOSSKNIGHT_DEATH_LAND 412+#define CLIP_MOSSKNIGHT_DORMANT_1 413+#define CLIP_MOSSKNIGHT_DORMANT_2 414+#define CLIP_MOSSKNIGHT_EVADE 415+#define CLIP_MOSSKNIGHT_IDLE 416+#define CLIP_MOSSKNIGHT_SHAKE 417+#define CLIP_MOSSKNIGHT_SHIELD_FRONT 418+#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 419+#define CLIP_MOSSKNIGHT_SHIELD_TOP 420+#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 421+#define CLIP_MOSSKNIGHT_SHOOT 422+#define CLIP_MOSSKNIGHT_SHOOT_END 423+#define CLIP_MOSSKNIGHT_SLASH 424+#define CLIP_MOSSKNIGHT_SLASH_2 425+#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 426+#define CLIP_MOSSKNIGHT_SLASH_EFFECT 427+#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 428+#define CLIP_MOSSKNIGHT_SLASH_END 429+#define CLIP_MOSSKNIGHT_SLASH_QUICK 430+#define CLIP_MOSSKNIGHT_TURN 431+#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 432+#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 433+#define CLIP_MOSSKNIGHT_WAKE 434+#define CLIP_MOSSKNIGHT_WALK 435+#define CLIP_HORNET_A_DASH 436+#define CLIP_HORNET_A_DASH_ANTIC 437+#define CLIP_HORNET_AIR_DASH_EFFECT 438+#define CLIP_HORNET_DEATH_AIR 439+#define CLIP_HORNET_EVADE 440+#define CLIP_HORNET_EVADE_ANTIC 441+#define CLIP_HORNET_FALL 442+#define CLIP_HORNET_FLASH 443+#define CLIP_HORNET_FLOURISH 444+#define CLIP_HORNET_G_DASH 445+#define CLIP_HORNET_G_DASH_ANTIC 446+#define CLIP_HORNET_G_DASH_EFFECT 447+#define CLIP_HORNET_G_DASH_RECOVER1 448+#define CLIP_HORNET_G_DASH_RECOVER2 449+#define CLIP_HORNET_HARD_LAND 450+#define CLIP_HORNET_IDLE 451+#define CLIP_HORNET_JUMP 452+#define CLIP_HORNET_JUMP_ANTIC 453+#define CLIP_HORNET_LAND 454+#define CLIP_HORNET_NEEDLE 455+#define CLIP_HORNET_NEEDLE_THREAD 456+#define CLIP_HORNET_RUN 457+#define CLIP_HORNET_SPHERE_ANTIC_A 458+#define CLIP_HORNET_SPHERE_ANTIC_G 459+#define CLIP_HORNET_SPHERE_ATTACK 460+#define CLIP_HORNET_SPHERE_BALL 461+#define CLIP_HORNET_SPHERE_RECOVER_A 462+#define CLIP_HORNET_SPHERE_RECOVER_G 463+#define CLIP_HORNET_STUN 464+#define CLIP_HORNET_STUN_AIR 465+#define CLIP_HORNET_THROW 466+#define CLIP_HORNET_THROW_ANTIC 467+#define CLIP_HORNET_THROW_EFFECT 468+#define CLIP_HORNET_THROW_RECOVER 469+#define CLIP_HORNET_WALL_IMPACT 470+#define CLIP_HORNET_WOUNDED 471+#define CLIP_MENDER_DEATH_AIR 472+#define CLIP_MENDER_DEATH_LAND 473+#define CLIP_MENDER_FLY 474+#define CLIP_MENDER_IDLE 475+#define CLIP_MENDER_STARTLE 476+#define CLIP_FUNGLING_DEATH 477+#define CLIP_FUNGLING_IDLE 478+#define CLIP_FUNGLING_TURNTOIDLE 479+#define CLIP_AMBLOOM_DEATH_AIR 480+#define CLIP_AMBLOOM_DEATH_LAND 481+#define CLIP_AMBLOOM_TURN 482+#define CLIP_AMBLOOM_WALK 483+#define CLIP_FUNGOON_DEATH 484+#define CLIP_FUNGOON_EFFECT 485+#define CLIP_FUNGOON_FLOAT 486+#define CLIP_FUNGOON_SPIT 487+#define CLIP_FUNGOON_SPIT_ANTIC 488+#define CLIP_FUNGOON_SPIT_RECOVER 489+#define CLIP_SHRUMELING_DEATH_AIR 490+#define CLIP_SHRUMELING_DEATH_LAND 491+#define CLIP_SHRUMELING_IDLE 492+#define CLIP_SHRUMELING_MINI_REST_1 493+#define CLIP_SHRUMELING_MINI_REST_2 494+#define CLIP_SHRUMELING_MINI_REST_3 495+#define CLIP_SHRUMELING_MINI_REST_TO_WAKE_1 496+#define CLIP_SHRUMELING_MINI_REST_TO_WAKE_2 497+#define CLIP_SHRUMELING_MINI_REST_TO_WAKE_3 498+#define CLIP_SHRUMELING_RUN 499+#define CLIP_SHRUMELING_STARTLE 500+#define CLIP_FUNGUSHUSK_ATTACK 501+#define CLIP_FUNGUSHUSK_DEATH_AIR 502+#define CLIP_FUNGUSHUSK_DEATH_LAND 503+#define CLIP_FUNGUSHUSK_IDLE 504+#define CLIP_FUNGUSHUSK_TURN 505+#define CLIP_FUNGUSHUSK_WALK 506+#define CLIP_OGRE_ANTIC 507+#define CLIP_OGRE_BOUNCE 508+#define CLIP_OGRE_DEATH_AIR 509+#define CLIP_OGRE_RUN 510+#define CLIP_OGRE_SLEEP 511+#define CLIP_OGRE_SMASH_LOOP 512+#define CLIP_OGRE_SMASH_TO_RUN 513+#define CLIP_OGRE_SPIT 514+#define CLIP_OGRE_TURN 515+#define CLIP_OGRE_WAKE 516+#define CLIP_SPORG_ATTACK 517+#define CLIP_SPORG_DEATH 518+#define CLIP_SPORG_EXPLODE 519+#define CLIP_SPORG_IDLE_1 520+#define CLIP_SPORG_IDLE_2 521+#define CLIP_SPORG_SLEEP 522+#define CLIP_SPORG_SLEEP_TO_IDLE 523+#define CLIP_BGATE_BG_OPENED 524+#define CLIP_BGATE_BG_CLOSE_1 525+#define CLIP_BGATE_BG_CLOSE_2 526+#define CLIP_BGATE_BG_OPEN 527+#define CLIP_BGATE_BG_CLOSED 528+#define CLIP_BGATE_BONE_GATE_OPENED 529+#define CLIP_BGATE_BONE_GATE_CLOSE 530+#define CLIP_BGATE_BONE_GATE_CLOSED 531+#define CLIP_BGATE_BONE_GATE_OPEN 532+#define CLIP_COCOON_COCOON_IDLE 533+#define CLIP_COCOON_COCOON_SWEAT 534+#define CLIP_COCOON_SCUTTLER_LAND 535+#define CLIP_COCOON_SCUTTLER_RUN 536+#define CLIP_FX_IMPACT_LINES 537+#define CLIP_FX_SPLAT 538+#define CLIP_FX_SPLAT2 539+#define CLIP_FX_SWORD 540+#define CLIP_FIREBALL_BLAST 541+#define CLIP_FIREBALL_BALL 542+#define CLIP_FIREBALL_BALL_END 543+#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 544+#define CLIP_DRIP_IDLE 545+#define CLIP_DRIP_DRIP 546+#define CLIP_DRIP_FALL 547+#define CLIP_DRIP_IMPACT 548+#define CLIP_HORNETCS_IDLE 549+#define CLIP_HORNETCS_JUMP_FULL 550+#define CLIP_HORNETCS_THROW_SIDE_START 551+#define CLIP_HORNETCS_THROW_SIDE 552+#define CLIP_HORNETCS_HARPOON_SIDE 553+#define CLIP_HORNETCS_THREAD_1 554+#define CLIP_HORNETCS_POINT 555+#define CLIP_HORNETCS_EVADE_ANTIC 556+#define CLIP_HORNETCS_EVADE 557+#define CLIP_HORNETCS_SOFT_LAND 558+#define CLIP_HORNETCS_TURN 559+#define CLIP_HORNETCS_RUN 560+#define CLIP_BULLET_IDLE 561+#define CLIP_BULLET_IMPACT 562+#define CLIP_BULLET_SHOCKWAVE_SPURT 563+#define CLIP_GLOB_IDLE 564+#define CLIP_GLOB_LAND 565+#define CLIP_PROP0_DOOR_CLOSED 566+#define CLIP_PROP0_DOOR_OPEN_1 567+#define CLIP_PROP0_DOOR_OPEN_2 568+#define CLIP_PROP0_FLOOR_IDLE 569+#define CLIP_PROP0_GATE_CLOSE 570+#define CLIP_PROP0_GATE_IDLE 571+#define CLIP_PROP0_IDLE 572+#define CLIP_PROP0_LEVER_ACTIVATED 573+#define CLIP_PROP0_LEVER_HIT 574+#define CLIP_PROP0_LEVER_IDLE 575+#define CLIP_PROP0_LEVER_UNHIT 576+#define CLIP_VM0_ARRIVE 577+#define CLIP_VM0_ARRIVE_SMOKE 578+#define CLIP_VM0_IDLE 579+#define CLIP_VM1_BELL_IDLE 580+#define CLIP_VM1_BELL_RING_R 581+#define CLIP_VM1_BELL_STAND 582+#define CLIP_VM1_BELL_STAND_APPEAR 583+#define CLIP_VM1_BOX_DISAPPEAR 584+#define CLIP_VM1_BOX_IDLE 585+#define CLIP_VM1_FRONT 586+#define CLIP_VM1_GRATE_DISAPPEAR 587+#define CLIP_VM1_GRATE_IDLE 588+#define CLIP_VM2_IDLE 589+#define CLIP_VM2_TALK 590+#define CLIP_VM2_TALK_END 591+#define CLIP_VM4_IDLE 592+#define CLIP_VM4_TALK_L 593+#define CLIP_VM4_TALK_L_END 594+#define CLIP_VM4_TALK_R 595+#define CLIP_VM4_TALK_R_END 596+#define CLIP_VM6_CRY 597+#define CLIP_VM6_CRY_TURN 598+#define CLIP_VM6_FREED 599+#define CLIP_VM6_IDLE 600+#define CLIP_VM7_STAND 601+#define CLIP_VM7_TURN_L 602+#define CLIP_VM7_TURN_R 603+#define CLIP_VM8_IDLE 604+#define CLIP_VM8_QUICK_ANTIC 605+#define CLIP_VM8_SLASH_RECOVER 606+#define CLIP_VM8_TURN 607+#define CLIP_VM8_WALK 608+#define CLIP_ANIM0_GROUND_PLINK_0 609+#define SPRITE_HERO_LIGHT 2631+#define SPRITE_DIALOGUE_BACKBOARD 2632+#define SPRITE_PROMPT_SHADOW 2633+#define SPRITE_CORPSE_NAIL 2634+#define SPRITE_FK_BARREL 2635+#define SPRITE_FK_STAFF 2636+#define SPRITE_DIGIT0 2939#define STYLE_DIALOGUE 0#define STYLE_PROMPT 1#define STYLE_TITLE_L 2@@ -656,21 +711,21 @@#define EK_OGRE 36#define EK_SPORG 37#define NUM_KINDS 38-#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 198, 197, -1, -1, -1, -1, -1, -1, -1, -1, 200, 201}}, {EF_BUZZER, {203, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 205, 206}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 213, 212, -1, -1, -1, -1, -1, -1, -1, 210, 211}}, {EF_BOUNCER, {-1, -1, -1, 216, -1, -1, -1, -1, -1, -1, -1, 214, 215}}, {EF_SPITTER, {-1, -1, -1, 219, 220, 218, -1, -1, -1, -1, -1, 217, -1}}, {EF_ROLLER, {223, -1, -1, 225, 224, 226, -1, -1, -1, -1, -1, 221, 222}}, {EF_BLOCKER, {233, -1, -1, 229, 234, 227, 228, 235, 236, 232, 231, -1, 230}}, {EF_HUSK, {242, 243, 244, 237, 239, 238, -1, -1, -1, -1, -1, 240, 241}}, {EF_HUSK, {250, 251, 252, 245, 247, 246, -1, -1, -1, -1, -1, 248, 249}}, {EF_HUSK, {258, 259, 260, 253, 255, 254, -1, -1, -1, -1, -1, 256, 257}}, {EF_HUSK, {266, 267, 268, 261, 263, 262, -1, -1, -1, -1, -1, 264, 265}}, {EF_LEAPER, {272, 274, 275, 269, 273, -1, -1, -1, -1, -1, -1, 270, 271}}, {EF_GUARD, {281, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 278, 279}}, {EF_FK, {303, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 301}}, {EF_FKHEAD, {323, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 321}}, {EF_HATCHER, {-1, -1, -1, 328, 327, -1, -1, -1, -1, -1, -1, 325, 326}}, {EF_HATCHLING, {-1, -1, -1, 329, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {335, -1, -1, 333, 334, 337, 336, 330, -1, -1, -1, 331, 332}}, {EF_GFLY, {350, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 359, 360, 358, 354, 355, -1, -1, -1, -1, -1, 356, 357}}, {EF_PIGEON, {-1, -1, -1, 362, 363, 364, 361, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {366, -1, -1, 369, 368, 367, -1, -1, -1, -1, -1, 365, -1}}, {EF_SHAKER, {373, 374, 375, 370, -1, -1, -1, -1, -1, -1, -1, 371, 372}}, {EF_MOSQUITO, {380, -1, -1, 382, 381, 377, 376, -1, -1, -1, -1, 378, 379}}, {EF_FATFLY, {386, -1, -1, 383, -1, -1, -1, -1, -1, -1, -1, 384, 385}}, {EF_MOSSCHARGER, {-1, -1, -1, 387, 388, 391, 394, 393, 395, 392, -1, 389, 390}}, {EF_MOSSKNIGHT, {401, 416, 420, -1, -1, -1, -1, -1, -1, -1, -1, 396, 397}}, {EF_HORNET, {436, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 424, -1}}, {EF_MENDER, {460, -1, -1, 461, 459, -1, -1, -1, -1, -1, -1, 457, 458}}, {EF_FUNGLING, {463, -1, -1, 464, -1, -1, -1, -1, -1, -1, -1, 462, -1}}, {EF_AMBLOOM, {-1, 467, 468, -1, -1, -1, -1, -1, -1, -1, -1, 465, 466}}, {EF_FUNGOON, {471, -1, -1, 473, 472, 474, 470, -1, -1, -1, -1, 469, -1}}, {EF_SHRUMELING, {477, -1, -1, 485, 484, -1, -1, -1, -1, -1, -1, 475, 476}}, {EF_SHAKER, {489, 490, 491, 486, -1, -1, -1, -1, -1, -1, -1, 487, 488}}, {EF_OGRE, {495, 500, -1, 501, 499, 492, 497, 498, 493, 496, -1, 494, -1}}, {EF_SPORG, {505, -1, -1, 508, 502, 507, -1, -1, -1, -1, -1, 503, -1}}}-#define TXT_PROMPT_LISTEN 19-#define TXT_PROMPT_REST 20-#define TXT_PROMPT_INSPECT 21-#define TXT_PROMPT_ENTER 22-#define TXT_PROMPT_SIT 23-#define TXT_PROMPT_SHOP 24-#define TXT_PROMPT_TRAVEL 25-#define TXT_PROMPT_ASCEND 26-#define TXT_PROMPT_DESCEND 27-#define TXT_PROMPT_EXIT 28-#define TXT_PROMPT_ACCEPT 29-#define TXT_PROMPT_TRADE 30-#define TXT_PROMPT_WATCH 31-#define TXT_PROMPT_CHALLENGE 32+#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 213, 212, -1, -1, -1, -1, -1, -1, -1, -1, 215, 216}}, {EF_BUZZER, {218, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 220, 221}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 228, 227, -1, -1, -1, -1, -1, -1, -1, 225, 226}}, {EF_BOUNCER, {-1, -1, -1, 231, -1, -1, -1, -1, -1, -1, -1, 229, 230}}, {EF_SPITTER, {-1, -1, -1, 234, 235, 233, -1, -1, -1, -1, -1, 232, -1}}, {EF_ROLLER, {238, -1, -1, 240, 239, 241, -1, -1, -1, -1, -1, 236, 237}}, {EF_BLOCKER, {248, -1, -1, 244, 249, 242, 243, 250, 251, 247, 246, -1, 245}}, {EF_HUSK, {257, 258, 259, 252, 254, 253, -1, -1, -1, -1, -1, 255, 256}}, {EF_HUSK, {265, 266, 267, 260, 262, 261, -1, -1, -1, -1, -1, 263, 264}}, {EF_HUSK, {273, 274, 275, 268, 270, 269, -1, -1, -1, -1, -1, 271, 272}}, {EF_HUSK, {281, 282, 283, 276, 278, 277, -1, -1, -1, -1, -1, 279, 280}}, {EF_LEAPER, {287, 289, 290, 284, 288, -1, -1, -1, -1, -1, -1, 285, 286}}, {EF_GUARD, {296, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 293, 294}}, {EF_FK, {318, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 316}}, {EF_FKHEAD, {338, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 336}}, {EF_HATCHER, {-1, -1, -1, 343, 342, -1, -1, -1, -1, -1, -1, 340, 341}}, {EF_HATCHLING, {-1, -1, -1, 344, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {350, -1, -1, 348, 349, 352, 351, 345, -1, -1, -1, 346, 347}}, {EF_GFLY, {365, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 374, 375, 373, 369, 370, -1, -1, -1, -1, -1, 371, 372}}, {EF_PIGEON, {-1, -1, -1, 377, 378, 379, 376, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {381, -1, -1, 384, 383, 382, -1, -1, -1, -1, -1, 380, -1}}, {EF_SHAKER, {388, 389, 390, 385, -1, -1, -1, -1, -1, -1, -1, 386, 387}}, {EF_MOSQUITO, {395, -1, -1, 397, 396, 392, 391, -1, -1, -1, -1, 393, 394}}, {EF_FATFLY, {401, -1, -1, 398, -1, -1, -1, -1, -1, -1, -1, 399, 400}}, {EF_MOSSCHARGER, {-1, -1, -1, 402, 403, 406, 409, 408, 410, 407, -1, 404, 405}}, {EF_MOSSKNIGHT, {416, 431, 435, -1, -1, -1, -1, -1, -1, -1, -1, 411, 412}}, {EF_HORNET, {451, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 439, -1}}, {EF_MENDER, {475, -1, -1, 476, 474, -1, -1, -1, -1, -1, -1, 472, 473}}, {EF_FUNGLING, {478, -1, -1, 479, -1, -1, -1, -1, -1, -1, -1, 477, -1}}, {EF_AMBLOOM, {-1, 482, 483, -1, -1, -1, -1, -1, -1, -1, -1, 480, 481}}, {EF_FUNGOON, {486, -1, -1, 488, 487, 489, 485, -1, -1, -1, -1, 484, -1}}, {EF_SHRUMELING, {492, -1, -1, 500, 499, -1, -1, -1, -1, -1, -1, 490, 491}}, {EF_SHAKER, {504, 505, 506, 501, -1, -1, -1, -1, -1, -1, -1, 502, 503}}, {EF_OGRE, {510, 515, -1, 516, 514, 507, 512, 513, 508, 511, -1, 509, -1}}, {EF_SPORG, {520, -1, -1, 523, 517, 522, -1, -1, -1, -1, -1, 518, -1}}}+#define TXT_PROMPT_LISTEN 40+#define TXT_PROMPT_REST 41+#define TXT_PROMPT_INSPECT 42+#define TXT_PROMPT_ENTER 43+#define TXT_PROMPT_SIT 44+#define TXT_PROMPT_SHOP 45+#define TXT_PROMPT_TRAVEL 46+#define TXT_PROMPT_ASCEND 47+#define TXT_PROMPT_DESCEND 48+#define TXT_PROMPT_EXIT 49+#define TXT_PROMPT_ACCEPT 50+#define TXT_PROMPT_TRADE 51+#define TXT_PROMPT_WATCH 52+#define TXT_PROMPT_CHALLENGE 53#define PROMPT_SORT 884737u#define DIGIT_ADV {0.4138f, 0.4138f, 0.4138f, 0.4138f, 0.4138f, 0.4138f, 0.4138f, 0.4138f, 0.4138f, 0.4138f}#define VMOP_NOP 1@@ -858,20 +913,22 @@#define VMEV_FIRST_MAP_UP 44#define VMEV_FIRST_MAP_DOWN 45#define VMEV_FK_RAGE_COMPLETE 46-#define VMEV_UPDATE_SHAMAN {255, 255, 255, 255, 255, 255, 255}-#define VMEV_SHOP_REGION_INACTIVE {255, 255, 255, 255, 255, 255, 255}-#define VMEV_SHOP_REGION_ACTIVE {255, 255, 255, 255, 255, 255, 255}+#define VMEV_UPDATE_SHAMAN {255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255}+#define VMEV_SHOP_REGION_INACTIVE {255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255}+#define VMEV_SHOP_REGION_ACTIVE {255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255}#define VMSTR_NPC_TITLE 19-#define VMSTR_VISITED 98-#define VMSTR_DISPLAY_RIGHT 99-#define VMSTR_HORNET_SAVER 100-#define VMSTR_ITEM 101+#define VMSTR_VISITED 270+#define VMSTR_DISPLAY_RIGHT 271+#define VMSTR_HORNET_SAVER 272+#define VMSTR_ITEM 273+#define VMSTR_ARENA_ITEM 235+#define VMSTR_ARENA_ITEM_KEPT 237#define STR_ATTACK_RANGE 15-#define STR_EVADE_RANGE 21-#define STR_SPIT_RANGE 22-#define STR_WAKE_BOX 23-#define STR_SLASH_HITBOX 24-#define STR_SLASH2_HITBOX 25+#define STR_EVADE_RANGE 28+#define STR_SPIT_RANGE 29+#define STR_WAKE_BOX 30+#define STR_SLASH_HITBOX 31+#define STR_SLASH2_HITBOX 32#define STR_DOOR_STAGEXIT 19#define STR_SMASH_HITS 13#define TITLE_KINGSPASS 0@@ -901,76 +958,77 @@#define TITLE_RUINS 24#define TITLE_MAGE_TOWER 25#define NUM_TITLES 26-#define TITLE_TABLE {{34, 35, -1, -1}, {36, 37, 38, -1}, {39, 40, -1, 41}, {42, 43, -1, 44}, {45, 46, -1, 47}, {48, 49, -1, -1}, {50, 51, 52, -1}, {53, 54, -1, -1}, {55, 56, -1, -1}, {57, 58, -1, -1}, {59, 60, -1, -1}, {61, 62, -1, -1}, {63, 64, -1, -1}, {65, 66, -1, -1}, {67, 68, -1, 69}, {70, 71, -1, 72}, {70, 71, -1, 73}, {74, 75, 76, -1}, {74, 75, -1, -1}, {77, 78, -1, 79}, {80, 81, -1, 82}, {83, 84, -1, 85}, {86, 87, -1, 88}, {89, 90, -1, 82}, {91, 92, -1, -1}, {93, 94, 95, -1}}-#define SPRITE_FLEUR_TOP 2440+#define TITLE_TABLE {{55, 56, -1, -1}, {57, 58, 59, -1}, {60, 61, -1, 62}, {63, 64, -1, 65}, {66, 67, -1, 68}, {69, 70, -1, -1}, {71, 72, 73, -1}, {74, 75, -1, -1}, {76, 77, -1, -1}, {78, 79, -1, -1}, {80, 81, -1, -1}, {82, 83, -1, -1}, {84, 85, -1, -1}, {86, 87, -1, -1}, {88, 89, -1, 90}, {91, 92, -1, 93}, {91, 92, -1, 94}, {95, 96, 97, -1}, {95, 96, -1, -1}, {98, 99, -1, 100}, {101, 102, -1, 103}, {104, 105, -1, 106}, {107, 108, -1, 109}, {110, 111, -1, 103}, {112, 113, -1, -1}, {114, 115, 116, -1}}+#define SPRITE_FLEUR_TOP 2637#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 2441+#define SPRITE_FLEUR_BOT 2638#define FLEUR_BOT_RECTS {{0.000f, 0.000f, 0.016f, 0.016f}, {0.000f, 0.000f, 0.016f, 0.016f}, {0.391f, 0.406f, 0.828f, 0.844f}, {-1.063f, 0.281f, 1.516f, 1.016f}, {-1.594f, -0.047f, 2.109f, 1.031f}, {-1.984f, -0.156f, 2.375f, 1.047f}, {-2.531f, -0.438f, 2.719f, 1.172f}, {-2.688f, -0.594f, 2.766f, 1.188f}, {-2.797f, -0.797f, 3.156f, 1.219f}, {-3.078f, -0.938f, 3.219f, 1.219f}, {-3.250f, -1.156f, 3.438f, 1.219f}, {-3.250f, -1.172f, 3.828f, 1.219f}, {-3.781f, -1.188f, 4.203f, 1.234f}, {-3.984f, -1.188f, 4.344f, 1.234f}, {-4.281f, -1.203f, 4.562f, 1.234f}, {-4.406f, -1.203f, 4.641f, 1.234f}, {-4.578f, -1.219f, 4.719f, 1.234f}, {-4.656f, -1.219f, 4.719f, 1.234f}, {-4.734f, -1.219f, 4.734f, 1.234f}, {-4.750f, -1.234f, 4.734f, 1.234f}, {-4.766f, -1.234f, 4.734f, 1.250f}, {-4.766f, -1.234f, 4.734f, 1.250f}}-#define VM_PIECE_BASE 2434-#define SPRITE_MSG_BG 2442-#define SPRITE_MSG_STOP 2443-#define SPRITE_MSG_FLEUR 2444-#define SPRITE_MSG_KEY 2445-#define SPRITE_MSG_ICON_FIREBALL 2446-#define SPRITE_MSG_ICON_DASH 2447-#define SPRITE_GRASS_BALL 2448-#define SPRITE_GAS 2449-#define SPRITE_GAS_FLASH 2450-#define SPRITE_SOUL_ORB 2451+#define VM_PIECE_BASE 2627+#define SPRITE_MSG_BG 2639+#define SPRITE_MSG_STOP 2640+#define SPRITE_MSG_FLEUR 2641+#define SPRITE_MSG_KEY 2642+#define SPRITE_MSG_ICON_FIREBALL 2643+#define SPRITE_MSG_ICON_DASH 2644+#define SPRITE_MSG_ICON_WALLJUMP 2645+#define SPRITE_GRASS_BALL 2646+#define SPRITE_GAS 2647+#define SPRITE_GAS_FLASH 2648+#define SPRITE_SOUL_ORB 2649#define SOUL_ORB_SORT {13, 0}-#define MSG_TABLE {{96, 97, 98, 99, 100, 101}, {102, 103, 104, 105, 106, 107}}-#define NOTICE_BACKBOARD {2452, 1.0000f, 0.6931f}-#define TUTE_FLEUR {2444, 1.0000f, 1.0000f}-#define TUTE_BACKBOARD {2453, 1.0000f, 0.9560f}-#define TUTE_IMAGE {2454, 1.0000f, 1.0000f}-#define TUTE_STOP {2443, 1.0000f, 1.0000f}-#define FOCUS_PROMPT_BG {2455, 0.0000f, -1.7900f, 1.0000f, 1.0000f}-#define FOCUS_PROMPT_TEXTS {{108, 0.1765f, -2.3773f, 0}, {109, 0.1765f, -3.1983f, 0}, {110, -0.0488f, -4.1348f, 1}, {111, 0.2240f, -5.2114f, 0}}-#define FOCUS_PROMPT_KEY {101, 0.4659f, -4.4341f}-#define NOTICE_ICONS {-1}+#define MSG_TABLE {{117, 118, 119, 120, 121, 122}, {123, 124, 125, 126, 127, 128}, {129, 124, 125, 130, 131, 132}}+#define NOTICE_BACKBOARD {2650, 1.0000f, 0.6931f}+#define TUTE_FLEUR {2641, 1.0000f, 1.0000f}+#define TUTE_BACKBOARD {2651, 1.0000f, 0.9560f}+#define TUTE_IMAGE {2652, 1.0000f, 1.0000f}+#define TUTE_STOP {2640, 1.0000f, 1.0000f}+#define FOCUS_PROMPT_BG {2653, 0.0000f, -1.7900f, 1.0000f, 1.0000f}+#define FOCUS_PROMPT_TEXTS {{133, 0.1765f, -2.3773f, 0}, {134, 0.1765f, -3.1983f, 0}, {135, -0.0488f, -4.1348f, 1}, {136, 0.2240f, -5.2114f, 0}}+#define FOCUS_PROMPT_KEY {122, 0.4659f, -4.4341f}+#define NOTICE_ICONS {2654, 2655, 2656}#define CHARM_ICON_K 1.5000f-#define CHARM_ICONS {-1, 2456, 2457, 2458, 2459, -1, 2460, 2461, 2462, -1, -1, -1, -1, -1, 2463, -1, -1, -1, 2464, 2465, 2466, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define CHARM_NAMES {-1, 112, 113, 114, 115, -1, 116, 117, 118, -1, -1, -1, -1, -1, 119, -1, -1, -1, 120, 121, 122, -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 123-#define TXT_CHARM_TUTE_SUB 124-#define TXT_CHARM_REMINDER 125-#define TXT_YN_YES 126-#define TXT_YN_NO 127-#define TXT_YN_NOT_ENOUGH 128-#define MENU_LOGO {2467, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CHARM_ICONS {-1, 2657, 2658, 2659, 2660, -1, 2661, 2662, 2663, -1, -1, -1, -1, 2664, 2665, -1, -1, -1, 2666, 2667, 2668, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CHARM_NAMES {-1, 137, 138, 139, 140, -1, 141, 142, 143, -1, -1, -1, -1, 144, 145, -1, -1, -1, 146, 147, 148, -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 149+#define TXT_CHARM_TUTE_SUB 150+#define TXT_CHARM_REMINDER 151+#define TXT_YN_YES 152+#define TXT_YN_NO 153+#define TXT_YN_NOT_ENOUGH 154+#define MENU_LOGO {2669, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_LOGO_Y 3.6585f#define MENU_START_Y -1.4181f#define MENU_HELP_Y -2.3582f#define MENU_QUIT_Y -3.2982f-#define MENU_POINTER {2468, 0.0000f, 0.0000f, 1.0023f, 1.0000f}+#define MENU_POINTER {2670, 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 {2469, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_PROFILES_FLEUR {2671, 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, {2470, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2471, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2472, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2473, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {9, {2474, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2475, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {24, {2476, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {35, {2477, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}+#define MENU_SLOT_ZONES {{2, {2672, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2673, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2674, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2675, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {9, {2676, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2677, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {24, {2678, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {35, {2679, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}#define MENU_SLOT_NZONES 8#define MENU_SLOT_BG_DY 0.0102f-#define MENU_SLOT_FLEUR {2478, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_FLEUR {2680, 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 {2479, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_SELECTOR {2681, 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 {2480, 0.0000f, 0.0000f, 1.0000f, 1.0025f}+#define MENU_SLOT_CURSOR {2682, 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 {2481, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_ORB {2683, 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 {2482, 0.0000f, 0.0000f, 1.0039f, 1.0000f}+#define MENU_SLOT_GEO {2684, 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 {2483, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_HEALTH {2685, 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@@ -988,80 +1046,80 @@#define MENU_SLOT_YES_X 2.5813f#define MENU_SLOT_NO_X 6.2296f#define MENU_BACK_Y -5.5406f-#define MENU_PAUSE_TOP {2484, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_TOP {2686, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_TOP_Y 2.3653f-#define MENU_PAUSE_BOT {2485, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_BOT {2687, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_BOT_Y -1.8877f#define MENU_PAUSE_CONTINUE_Y 1.1916f#define MENU_PAUSE_HELP_Y 0.0940f#define MENU_PAUSE_QUIT_Y -1.0035f#define MENU_KEYS_TITLE_Y 5.7763f-#define MENU_KEYS_FLEUR {2469, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_KEYS_FLEUR {2671, 0.0000f, 0.0000f, 1.0000f, 1.0807f}#define MENU_KEYS_FLEUR_Y 4.7346f#define MENU_KEYS_ROW_Y 3.1809f#define MENU_KEYS_DY -1.0162f#define MENU_KEYS_BUTTON_Y -5.8306f-#define TXT_MAIN_START 129-#define TXT_MAIN_QUIT 130-#define TXT_PROFILE_NEW_GAME 131-#define TXT_PROFILE_CLEAR_BUTTON 132-#define TXT_PROFILE_CLEAR_PROMPT 133-#define TXT_NAV_YES 134-#define TXT_NAV_NO 135-#define TXT_NAV_BACK 136-#define TXT_PAUSE_CONTINUE 137-#define TXT_PAUSE_MAIN 138-#define TXT_PROFILE_CORRUPTED 139-#define TXT_PROFILE_LOADING 140-#define TXT_SCREEN_SAVE_PROFILES 141-#define TXT_SCREEN_KEYBOARD 142-#define MENU_KEYS {{143, 154}, {144, 155}, {145, 156}, {146, 157}, {147, 158}, {148, 159}, {149, 160}, {150, 161}, {151, 162}, {152, 163}, {153, 164}}+#define TXT_MAIN_START 155+#define TXT_MAIN_QUIT 156+#define TXT_PROFILE_NEW_GAME 157+#define TXT_PROFILE_CLEAR_BUTTON 158+#define TXT_PROFILE_CLEAR_PROMPT 159+#define TXT_NAV_YES 160+#define TXT_NAV_NO 161+#define TXT_NAV_BACK 162+#define TXT_PAUSE_CONTINUE 163+#define TXT_PAUSE_MAIN 164+#define TXT_PROFILE_CORRUPTED 165+#define TXT_PROFILE_LOADING 166+#define TXT_SCREEN_SAVE_PROFILES 167+#define TXT_SCREEN_KEYBOARD 168+#define MENU_KEYS {{169, 180}, {170, 181}, {171, 182}, {172, 183}, {173, 184}, {174, 185}, {175, 186}, {176, 187}, {177, 188}, {178, 189}, {179, 190}}#define MENU_NKEYS 11-#define TXT_HELP 165-#define TXT_HELP_TITLE 166-#define TXT_NEXT 167-#define TXT_HELP_LINES 168-#define TXT_ZONES {169, 170, 171, 172, 173, 174, 175, 176}-#define TXT_CROSS_TO 177-#define TXT_CROSS_APPS {178, 179}+#define TXT_HELP 191+#define TXT_HELP_TITLE 192+#define TXT_NEXT 193+#define TXT_HELP_LINES 194+#define TXT_ZONES {195, 196, 197, 198, 199, 200, 201, 202}+#define TXT_CROSS_TO 203+#define TXT_CROSS_APPS {204, 205}#define CROSS_NAPPS 2-#define TXT_CROSS_SAVED 180-#define TXT_CROSS_NEW 181+#define TXT_CROSS_SAVED 206+#define TXT_CROSS_NEW 207#define INV_X -4.0500f#define INV_Y 7.5500f-#define INV_BORDER {{2486, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2486, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2487, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2488, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2489, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2490, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}+#define INV_BORDER {{2688, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2688, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2689, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2690, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2691, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2692, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}#define INV_NBORDER 6-#define INV_FRAME {2491, 4.0479f, -7.1963f, 1.0f, 1.0f}-#define INV_ARROW_L {2492, -9.8300f, -7.2000f, 1.0000f, 1.0000f}-#define INV_ARROW_R {2492, 18.0300f, -7.2000f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_L {2493, -9.8600f, -0.4300f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_R {2493, 18.0400f, -0.4300f, 1.0000f, 1.0000f}+#define INV_FRAME {2693, 4.0479f, -7.1963f, 1.0f, 1.0f}+#define INV_ARROW_L {2694, -9.8300f, -7.2000f, 1.0000f, 1.0000f}+#define INV_ARROW_R {2694, 18.0300f, -7.2000f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_L {2695, -9.8600f, -0.4300f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_R {2695, 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 {184, 185, 186, 187}-#define CH_BB {2494, -7.9200f, -8.3700f, 1.0000f, 1.0000f}+#define TXT_INV_PANES {210, 211, 212, 213}+#define CH_BB {2696, -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 {2495, 0.0500f, 0.0600f, 1.0000f, 0.9919f}+#define CH_GLOW {2697, 0.0500f, 0.0600f, 1.0000f, 0.9919f}#define CH_GLOW_A 0.6970f-#define CH_ICONS {-1, 2456, 2457, 2458, 2459, -1, 2460, 2461, 2462, -1, -1, -1, -1, -1, 2463, -1, -1, -1, 2464, 2465, 2466, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define CH_NEXT_DOT {2496, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_ICONS {-1, 2657, 2658, 2659, 2660, -1, 2661, 2662, 2663, -1, -1, -1, -1, 2664, 2665, -1, -1, -1, 2666, 2667, 2668, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CH_NEXT_DOT {2698, 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 {2497, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define CH_NOTCH_EMPTY {2498, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_FULL {2699, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_EMPTY {2700, 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 {2499, -0.8400f, -6.9300f, 1.0000f, 0.1591f}+#define CH_DIVIDER {2701, -0.8400f, -6.9300f, 1.0000f, 0.1591f}#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}-#define CH_COST_PIP {2497, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_COST_PIP {2699, 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@@ -1070,60 +1128,60 @@#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 {2500, 16.3208f, -13.2878f, 1.0f, 1.0f}+#define CH_CONFIRM_KEY {2702, 16.3208f, -13.2878f, 1.0f, 1.0f}#define CH_CONFIRM_KEY_W 0.6412f-#define CH_CURSOR {2501, 0.0000f, 0.0000f, 1.0000f, 0.9756f}+#define CH_CURSOR {2703, 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 188-#define TXT_CHARM_TXT_OVERCHARMED 189-#define TXT_CHARM_TXT_COST 190-#define TXT_CTRL_EQUIP 191-#define TXT_CTRL_UNEQUIP 192-#define TXT_CHARM_ALERT_NONE 193-#define TXT_CHARM_ALERT_NONE_BENCH 194-#define TXT_CHARM_NOTCHES 195-#define TXT_CHARM_NAMES_INV {-1, 196, 197, 198, 199, -1, 200, 201, 202, -1, -1, -1, -1, -1, 203, -1, -1, -1, 204, 205, 206, -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, 207, 208, 209, 210, -1, 211, 212, 213, -1, -1, -1, -1, -1, 214, -1, -1, -1, 215, 216, 217, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define TXT_KEY_OK 218-#define TXT_CHARM_BENCH 219-#define INV_FIXED {{2502, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2503, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2504, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2505, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2506, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2507, -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}, {2508, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2509, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}+#define TXT_CHARM_TXT_EQUIPPED 214+#define TXT_CHARM_TXT_OVERCHARMED 215+#define TXT_CHARM_TXT_COST 216+#define TXT_CTRL_EQUIP 217+#define TXT_CTRL_UNEQUIP 218+#define TXT_CHARM_ALERT_NONE 219+#define TXT_CHARM_ALERT_NONE_BENCH 220+#define TXT_CHARM_NOTCHES 221+#define TXT_CHARM_NAMES_INV {-1, 222, 223, 224, 225, -1, 226, 227, 228, -1, -1, -1, -1, 229, 230, -1, -1, -1, 231, 232, 233, -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, 234, 235, 236, 237, -1, 238, 239, 240, -1, -1, -1, -1, 241, 242, -1, -1, -1, 243, 244, 245, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define TXT_KEY_OK 246+#define TXT_CHARM_BENCH 247+#define INV_FIXED {{2704, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2705, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2706, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2707, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2708, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2709, -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}, {2710, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2711, -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 {{2510, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2511, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2512, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2513, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}-#define INV_VESSEL_PIECES {{2514, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2515, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2516, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}+#define INV_HEART_PIECES {{2712, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2713, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2714, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2715, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}+#define INV_VESSEL_PIECES {{2716, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2717, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2718, -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 {{2517, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2518, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2519, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2520, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2521, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2522, 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 {{2523, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2524, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2525, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2526, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}+#define INV_EQ {{2719, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2720, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2721, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2722, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2723, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2724, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2725, 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}, {1.4420f, 1.4140f, 0.0000f, 0.0000f}}+#define INV_TRINKETS {{2726, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2727, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2728, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2729, 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 {2527, 4.2400f, -10.8700f, 1.0000f, 1.0000f}-#define INV_DIVIDERS {{2528, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2528, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}+#define INV_TRINKET_BB {2730, 4.2400f, -10.8700f, 1.0000f, 1.0000f}+#define INV_DIVIDERS {{2731, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2731, 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 {{220, 221}, {222, 223}, {224, 225}, {222, 226}, {222, 227}, {228, 229}}-#define TXT_INV_VESSEL {{220, 221}, {230, 231}, {232, 233}, {230, 234}, {235, 236}}-#define TXT_INV_FIXED {{237, 238}, {239, 240}, {241, 242}, {243, 244}}-#define TXT_INV_EQ {{245, 246}, {247, 248}, {249, 250}, {251, 252}, {253, 254}, {255, 256}}-#define TXT_INV_QUILL {257, 258, 259, 260}-#define TXT_INV_TRINKETS {{261, 262}, {263, 264}, {265, 266}, {267, 268}}-#define SHOP_BACKBOARD {2529, 4.9000f, -0.3200f, 0.8667f, 1.0000f}-#define SHOP_MASK_TOP {2530, 5.1230f, 4.8800f, 1.0000f, 0.9013f}-#define SHOP_MASK_BOTTOM {2531, 5.1537f, -5.6200f, 1.0000f, 0.8820f}-#define SHOP_ARROW_U {2532, 1.7000f, 1.8900f, 1.0000f, 1.0000f}-#define SHOP_ARROW_D {2532, 1.7000f, -0.3800f, -1.0000f, 1.0000f}-#define SHOP_SELECTOR {2533, 1.7300f, 0.7600f, 0.9332f, 1.0000f}-#define SHOP_CONFIRM_GEO {2534, 4.2800f, 0.3400f, 1.0000f, 1.0000f}-#define SHOP_POINTER_L {2535, 3.6119f, -2.0798f, 1.0000f, 1.0000f}-#define SHOP_POINTER_R {2535, 6.6249f, -2.0798f, -1.0000f, 1.0000f}+#define TXT_INV_HEART {{248, 249}, {250, 251}, {252, 253}, {250, 254}, {250, 255}, {256, 257}}+#define TXT_INV_VESSEL {{248, 249}, {258, 259}, {260, 261}, {258, 262}, {263, 264}}+#define TXT_INV_FIXED {{265, 266}, {267, 268}, {269, 270}, {271, 272}}+#define TXT_INV_EQ {{273, 274}, {275, 276}, {277, 278}, {279, 280}, {281, 282}, {283, 284}, {285, 286}}+#define TXT_INV_QUILL {287, 288, 289, 290}+#define TXT_INV_TRINKETS {{291, 292}, {293, 294}, {295, 296}, {297, 298}}+#define SHOP_BACKBOARD {2732, 4.9000f, -0.3200f, 0.8667f, 1.0000f}+#define SHOP_MASK_TOP {2733, 5.1230f, 4.8800f, 1.0000f, 0.9013f}+#define SHOP_MASK_BOTTOM {2734, 5.1537f, -5.6200f, 1.0000f, 0.8820f}+#define SHOP_ARROW_U {2735, 1.7000f, 1.8900f, 1.0000f, 1.0000f}+#define SHOP_ARROW_D {2735, 1.7000f, -0.3800f, -1.0000f, 1.0000f}+#define SHOP_SELECTOR {2736, 1.7300f, 0.7600f, 0.9332f, 1.0000f}+#define SHOP_CONFIRM_GEO {2737, 4.2800f, 0.3400f, 1.0000f, 1.0000f}+#define SHOP_POINTER_L {2738, 3.6119f, -2.0798f, 1.0000f, 1.0000f}+#define SHOP_POINTER_R {2738, 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 270+#define TXT_KEY_BACK 300#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}}@@ -1140,7 +1198,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 {2536, 5.5100f, 2.5800f, 1.0000f, 1.0000f}+#define SHOP_PEG {2739, 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}@@ -1151,24 +1209,24 @@#define SHOP_ROW_TOP 4.9000f#define SHOP_ROW_BOTTOM -5.2500f#define SHOP_ARROW_BOB 0.1500f-#define TXT_SHOP_CTRL_BUY 273-#define TXT_SHOP_CTRL_EXIT 274-#define TXT_SHOP_CTRL_CONFIRM 275-#define TXT_SHOP_CTRL_CANCEL 276-#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 277-#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 278-#define TXT_SHOP_CHARM_TXT_NOTCHCOST 279-#define TXT_SHOP_YES 280-#define TXT_SHOP_NO 281+#define TXT_SHOP_CTRL_BUY 303+#define TXT_SHOP_CTRL_EXIT 304+#define TXT_SHOP_CTRL_CONFIRM 305+#define TXT_SHOP_CTRL_CANCEL 306+#define TXT_SHOP_SHOP_PURCHASE_CONFIRM 307+#define TXT_SHOP_SHOP_PURCHASE_COMPLETE 308+#define TXT_SHOP_CHARM_TXT_NOTCHCOST 309+#define TXT_SHOP_YES 310+#define TXT_SHOP_NO 311#define SHOP_DESC_BOTTOM -5.0500f-#define SHOP_ITEMS {{2538, 0.5714f, 282, 283, 150, 1, 125, -1, 0, 0}, {2538, 0.5714f, 282, 284, 500, 1, 126, 125, 0, 0}, {2539, 0.5714f, 285, 286, 550, 3, 127, -1, 0, 0}, {2540, 0.5714f, 287, 288, 950, 10, 128, -1, 0, 0}, {2541, 0.5714f, 289, 290, 300, 2, 37, -1, 0, 1}, {2542, 0.5714f, 291, 292, 200, 2, 40, -1, 0, 4}, {2543, 0.5714f, 293, 294, 1800, 0, 119, -1, 0, 0}, {2544, 0.5714f, 295, 296, 60, 11, 129, -1, 0, 0}, {2545, 0.5714f, 297, 298, 220, 2, 38, -1, 0, 2}, {2546, 0.5714f, 299, 300, 120, 0, 2, -1, 0, 0}, {2547, 0.5714f, 301, 302, 40, 9, 130, 10, 0, 0}, {2547, 0.5714f, 303, 304, 80, 9, 131, 28, 0, 0}, {2548, 0.5714f, 305, 306, 100, 16, 133, -1, 0, 0}, {2549, 0.5714f, 307, 308, 100, 16, 134, -1, 0, 0}, {2550, 0.5714f, 309, 310, 100, 16, 135, -1, 0, 0}, {2551, 0.5714f, 311, 312, 100, 16, 137, 147, 0, 0}, {2552, 0.5714f, 313, 314, 100, 16, 136, -1, 0, 0}, {2553, 0.5714f, 315, 316, 100, 17, 139, -1, 0, 0}, {2554, 0.5714f, 317, 318, 100, 17, 140, -1, 0, 0}, {2555, 0.5714f, 319, 320, 100, 17, 141, 14, 0, 0}, {2556, 0.5714f, 321, 322, 210, 17, 142, 14, 0, 0}, {2557, 0.5714f, 323, 324, 250, 2, 44, -1, 0, 8}, {2558, 0.5714f, 325, 326, 300, 2, 54, -1, 0, 18}, {2559, 0.5714f, 327, 328, 120, 2, 50, -1, 0, 14}, {2560, 0.5714f, 329, 330, 220, 2, 55, -1, 0, 19}, {2561, 0.5714f, 331, 332, 800, 2, 43, -1, 0, 7}, {2562, 0.5714f, 333, 334, 120, 8, 143, -1, 5, 0}, {2562, 0.5714f, 333, 334, 500, 8, 144, -1, 10, 0}, {2562, 0.5714f, 333, 334, 900, 8, 145, -1, 18, 0}, {2562, 0.5714f, 333, 335, 1400, 8, 146, -1, 25, 0}}-#define SHOP_FIRST {0, 8, 21, 30}-#define SHOP_ROW_GEO {2537, 1.4551f, 0.0000f, 1.0000f, 1.0000f}+#define SHOP_ITEMS {{2741, 0.5714f, 312, 313, 150, 1, 125, -1, 0, 0}, {2741, 0.5714f, 312, 314, 500, 1, 126, 125, 0, 0}, {2742, 0.5714f, 315, 316, 550, 3, 127, -1, 0, 0}, {2743, 0.5714f, 317, 318, 950, 10, 128, -1, 0, 0}, {2744, 0.5714f, 319, 320, 300, 2, 37, -1, 0, 1}, {2745, 0.5714f, 321, 322, 200, 2, 40, -1, 0, 4}, {2746, 0.5714f, 323, 324, 1800, 0, 119, -1, 0, 0}, {2747, 0.5714f, 325, 326, 60, 11, 129, -1, 0, 0}, {2748, 0.5714f, 327, 328, 220, 2, 38, -1, 0, 2}, {2749, 0.5714f, 329, 330, 120, 0, 2, -1, 0, 0}, {2750, 0.5714f, 331, 332, 40, 9, 130, 10, 0, 0}, {2750, 0.5714f, 333, 334, 80, 9, 131, 28, 0, 0}, {2750, 0.5714f, 335, 336, 100, 9, 178, 180, 0, 0}, {2751, 0.5714f, 337, 338, 100, 16, 133, -1, 0, 0}, {2752, 0.5714f, 339, 340, 100, 16, 134, -1, 0, 0}, {2753, 0.5714f, 341, 342, 100, 16, 135, -1, 0, 0}, {2754, 0.5714f, 343, 344, 100, 16, 137, 147, 0, 0}, {2755, 0.5714f, 345, 346, 100, 16, 136, -1, 0, 0}, {2756, 0.5714f, 347, 348, 100, 17, 139, -1, 0, 0}, {2757, 0.5714f, 349, 350, 100, 17, 140, -1, 0, 0}, {2758, 0.5714f, 351, 352, 100, 17, 141, 14, 0, 0}, {2759, 0.5714f, 353, 354, 210, 17, 142, 14, 0, 0}, {2760, 0.5714f, 355, 356, 250, 2, 44, -1, 0, 8}, {2761, 0.5714f, 357, 358, 300, 2, 54, -1, 0, 18}, {2762, 0.5714f, 359, 360, 120, 2, 50, -1, 0, 14}, {2763, 0.5714f, 361, 362, 220, 2, 55, -1, 0, 19}, {2764, 0.5714f, 363, 364, 800, 2, 43, -1, 0, 7}, {2765, 0.5714f, 365, 366, 120, 8, 143, -1, 5, 0}, {2765, 0.5714f, 365, 366, 500, 8, 144, -1, 10, 0}, {2765, 0.5714f, 365, 366, 900, 8, 145, -1, 18, 0}, {2765, 0.5714f, 365, 367, 1400, 8, 146, -1, 25, 0}}+#define SHOP_FIRST {0, 8, 22, 31}+#define SHOP_ROW_GEO {2740, 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 {337, 338, 339}+#define SHOP_NOSTOCK {369, 370, 371}#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}@@ -1179,82 +1237,83 @@#define STAG_N 4#define STAG_AT {0.3000f, 0.3000f}#define STAG_K 1.2646f-#define STAG_BACKING {2563, -0.4427f, 0.0000f, 1.0000f, 0.6408f}+#define STAG_BACKING {2766, -0.4427f, 0.0000f, 1.0000f, 0.6408f}#define STAG_BACKING_A 0.9020f-#define STAG_PIECES {{2564, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2565, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2566, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {2567, 0.4147f, 1.5909f, 1.0000f, 1.0000f}, {2568, 3.2899f, -0.9763f, 1.0000f, 1.0000f}}+#define STAG_PIECES {{2767, 3.6420f, -0.6829f, 1.0000f, 1.0000f}, {2768, 2.8499f, 2.2363f, 1.0000f, 1.0000f}, {2769, 5.8131f, 2.5590f, 1.0000f, 1.0000f}, {2770, 0.4147f, 1.5909f, 1.0000f, 1.0000f}, {2771, 3.2899f, -0.9763f, 1.0000f, 1.0000f}}#define STAG_OPENED {-1, 155, 156, 171}#define STAG_MARKS {{2.9379f, 3.7471f}, {4.8742f, 2.0690f}, {-0.4360f, 2.7790f}, {3.5687f, -0.9763f}}#define STAG_SELECTOR {0.0000f, 0.0000f, 1.1797f, 1.2092f}-#define STAG_MAP_KNIGHT {2569, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define STAG_MAP_SHADOW {2570, 0.0110f, -0.0100f, 1.0000f, 0.9227f}+#define STAG_MAP_KNIGHT {2772, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define STAG_MAP_SHADOW {2773, 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 {2571, 2.8680f, 0.6180f, -1.0000f, 1.0000f}-#define STAG_POINTER_L {2571, -2.8680f, 0.6180f, 1.0000f, 1.0000f}+#define STAG_POINTER_R {2774, 2.8680f, 0.6180f, -1.0000f, 1.0000f}+#define STAG_POINTER_L {2774, -2.8680f, 0.6180f, 1.0000f, 1.0000f}#define STAG_ROW {-7.5992f, 3.9576f}-#define STAG_LIST_KNIGHT {2569, -10.5102f, 4.6056f, 1.0000f, 1.0000f}-#define STAG_DIVIDER {2572, -7.6003f, 5.2734f, -1.0000f, -0.8696f}+#define STAG_LIST_KNIGHT {2772, -10.5102f, 4.6056f, 1.0000f, 1.0000f}+#define STAG_DIVIDER {2775, -7.6003f, 5.2734f, -1.0000f, -0.8696f}#define STAG_T_STATIONS {-7.5992f, 6.0194f, 5.8145f}-#define TXT_STAG_STATIONS 340-#define TXT_STAG_NAMES {341, 301, 303, 342}+#define TXT_STAG_STATIONS 372+#define TXT_STAG_NAMES {373, 331, 333, 374}#define STAG_NAMES_STR {29, 28, 32, 31}#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 343+#define TXT_STAG_CTRL_TRAVEL 375#define STAG_T_ACT_CANCEL {11.1713f, -5.3525f, 15.3500f}#define STAG_KEY_CANCEL {11.7464f, -5.6213f}-#define TXT_STAG_CTRL_CANCEL 276+#define TXT_STAG_CTRL_CANCEL 306#define STAG_SCENES_STR {42, 41, 43, 44}#define STAG_SCENES_ROOM {32772, 32787, 32804, 6}-#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 347, 0x0u}, {2, 18, 130, -0.0400f, -7.8800f, 348, 0x20u}, {20, 12, 131, 16.3100f, -7.8700f, 350, 0x0u}}-#define MAP_ROOMS {{0, 255, 2573, 2574, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 255, 2580, 2581, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 127, 2583, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 2584, 2585, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 255, 2586, 2587, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 255, 2588, 2589, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 255, 2590, 2591, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 255, 2592, 2593, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2594, 2595, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 38, 2596, -1, -2.2000f, 3.7130f, 0.6600f, 0.7900f, 0xB5DDFB, 0}, {1, 255, 2597, 2598, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 255, 2599, 2600, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 2601, 2602, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2603, 2604, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2605, 2606, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 255, 2607, 2608, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 255, 2609, 2610, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 255, 2611, 2612, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 255, 2613, 2614, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2615, 2616, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 2617, 2618, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 255, 2619, 2620, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 255, 2621, 2622, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 2623, 2624, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 255, 2625, 2626, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 2627, 2628, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 255, 2629, 2630, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 2631, 2632, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 255, 2633, 2634, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 255, 2635, 2636, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 255, 2637, 2638, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 255, 2639, 2640, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}-#define MAP_PINS {{0, 0, 2575, -2.0390f, 7.7500f, 133, -1}, {0, 0, 2576, -1.6430f, 7.7500f, 137, -1}, {0, 0, 2577, -2.4700f, 7.7500f, 135, 122}, {0, 0, 2578, -1.2540f, 7.7600f, 135, 123}, {1, 1, 2582, -6.2100f, 7.6800f, 134, -1}, {21, 1, 2582, -10.9970f, 6.6240f, 134, -1}, {22, 0, 2575, -11.2580f, 4.9690f, 133, -1}, {30, 0, 2575, -7.6610f, 6.0700f, 133, -1}}-#define MAP_NEXT {{0, 2579, -1.0730f, 6.4850f, 180.0000f, 346, -1.0730f, 6.1870f, 1, -1}, {19, 2579, -1.0730f, 7.2500f, 0.0000f, 345, -1.0930f, 7.9120f, 1, -1}, {31, 2579, -4.5300f, 5.8450f, -90.0000f, 346, -4.1075f, 6.0470f, 0, 6}}-#define MAP_NAMES {{0, -1, 344, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 345, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 346, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {2, -1, 349, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}+#define MAP_AREAS {{0, 2, -1, 4.0700f, -11.6200f, 379, 0x0u}, {2, 18, 130, -0.0400f, -7.8800f, 380, 0x20u}, {20, 12, 131, 16.3100f, -7.8700f, 382, 0x0u}}+#define MAP_ROOMS {{0, 255, 2776, 2777, -1.9230f, 7.6490f, 4.0800f, 2.1400f, 0xB6B6B6, 1}, {0, 255, 2783, 2784, -5.4430f, 7.4690f, 2.9600f, 1.4800f, 0x636363, 1}, {1, 127, 2786, -1, 0.8660f, 4.8850f, 1.8700f, 0.4300f, 0xB5DDFB, 0}, {1, 255, 2787, 2788, 3.3290f, 6.5270f, 0.8900f, 0.3800f, 0xB5DDFB, 1}, {1, 255, 2789, 2790, 0.9410f, 4.0880f, 1.3600f, 0.3900f, 0xB5DDFB, 1}, {1, 255, 2791, 2792, 1.6660f, 6.5240f, 1.3000f, 0.3400f, 0xB5DDFB, 1}, {1, 255, 2793, 2794, -2.2270f, 4.6390f, 0.6800f, 0.8600f, 0xB5DDFB, 1}, {1, 255, 2795, 2796, 0.8660f, 4.8850f, 1.8584f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2797, 2798, 2.0720f, 3.8620f, 0.9500f, 0.7900f, 0xB5DDFB, 1}, {1, 38, 2799, -1, -2.2000f, 3.7130f, 0.6600f, 0.7900f, 0xB5DDFB, 0}, {1, 255, 2800, 2801, 1.6240f, 5.9190f, 1.3800f, 0.5200f, 0xB5DDFB, 1}, {1, 255, 2802, 2803, 2.6280f, 6.1870f, 0.7000f, 1.0300f, 0xB5DDFB, 1}, {1, 255, 2804, 2805, -0.3640f, 4.0580f, 1.2500f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2806, 2807, -3.1500f, 4.3130f, 1.1700f, 0.3500f, 0xB5DDFB, 1}, {1, 255, 2808, 2809, -0.5860f, 5.0990f, 1.1900f, 0.8800f, 0xB5DDFB, 1}, {1, 255, 2810, 2811, -1.4530f, 4.2330f, 0.9600f, 0.6900f, 0xB5DDFB, 1}, {1, 255, 2812, 2813, -2.2170f, 5.8440f, 0.6800f, 1.5700f, 0xB5DDFB, 1}, {1, 255, 2814, 2815, 2.0240f, 4.9490f, 0.5900f, 1.4673f, 0xB5DDFB, 1}, {1, 255, 2816, 2817, 0.3470f, 6.6100f, 1.3800f, 0.5000f, 0xB5DDFB, 1}, {1, 255, 2818, 2819, -1.1130f, 6.6140f, 1.5800f, 0.7500f, 0xB5DDFB, 1}, {2, 255, 2820, 2821, -6.5180f, 4.0350f, 1.0100f, 0.8900f, 0xCFFFC3, 1}, {2, 255, 2822, 2823, -10.8980f, 6.4740f, 1.3600f, 0.7100f, 0xCFFFC3, 1}, {2, 255, 2824, 2825, -11.2830f, 5.0920f, 0.5900f, 2.1300f, 0xCFFFC3, 1}, {2, 255, 2826, 2827, -11.8520f, 3.8320f, 1.6500f, 0.4800f, 0xCFFFC3, 1}, {2, 255, 2828, 2829, -12.2580f, 6.4100f, 1.3800f, 0.8200f, 0xCFFFC3, 1}, {2, 255, 2830, 2831, -7.6750f, 3.7830f, 1.3400f, 0.4200f, 0xCFFFC3, 1}, {2, 255, 2832, 2833, -9.6830f, 3.8190f, 2.6800f, 0.4600f, 0xCFFFC3, 1}, {2, 255, 2834, 2835, -6.8080f, 4.7040f, 2.3200f, 0.5100f, 0xCFFFC3, 1}, {2, 255, 2836, 2837, -13.6530f, 6.1350f, 1.4100f, 1.0200f, 0xCFFFC3, 1}, {2, 255, 2838, 2839, -8.2930f, 5.2090f, 0.6700f, 1.2200f, 0xCFFFC3, 1}, {2, 255, 2840, 2841, -7.6430f, 5.9550f, 0.6700f, 0.7500f, 0xCFFFC3, 1}, {2, 255, 2842, 2843, -6.1000f, 5.8290f, 2.4400f, 0.6700f, 0xCFFFC3, 1}}+#define MAP_PINS {{0, 0, 2778, -2.0390f, 7.7500f, 133, -1}, {0, 0, 2779, -1.6430f, 7.7500f, 137, -1}, {0, 0, 2780, -2.4700f, 7.7500f, 135, 122}, {0, 0, 2781, -1.2540f, 7.7600f, 135, 123}, {1, 1, 2785, -6.2100f, 7.6800f, 134, -1}, {21, 1, 2785, -10.9970f, 6.6240f, 134, -1}, {22, 0, 2778, -11.2580f, 4.9690f, 133, -1}, {30, 0, 2778, -7.6610f, 6.0700f, 133, -1}}+#define MAP_NEXT {{0, 2782, -1.0730f, 6.4850f, 180.0000f, 378, -1.0730f, 6.1870f, 1, -1}, {19, 2782, -1.0730f, 7.2500f, 0.0000f, 377, -1.0930f, 7.9120f, 1, -1}, {31, 2782, -4.5300f, 5.8450f, -90.0000f, 378, -4.1075f, 6.0470f, 0, 6}}+#define MAP_NAMES {{0, -1, 376, -0.2000f, 8.3901f, 0xFFFFFF, 1, 0}, {0, -1, 377, 3.3200f, 8.4801f, 0xFFFFFF, 1, 1}, {1, -1, 378, 6.7700f, 3.3701f, 0xB5DCFB, 1, 1}, {2, -1, 381, -5.0993f, 5.4501f, 0xCFFFC3, 0, 1}}#define MAP_QUICK_K 1.5500f-#define MAP_SHADE {{2641, 0.0055f, -0.0110f, 178}, {2642, 0.0000f, 0.0000f, 255}}-#define MAP_MARKERS {2643, 2644, 2645, 2646}+#define MAP_SHADE {{2844, 0.0055f, -0.0110f, 178}, {2845, 0.0000f, 0.0000f, 255}}+#define MAP_MARKERS {2846, 2847, 2848, 2849}#define MAP_COMPASS_K 0.7000f#define MAP_BG_A 0.4438f#define MAP_TITLE {0.0000f, 7.5363f}-#define MAP_TITLE_BACK {2647, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}-#define MAP_NO_MAP {2648, 0.0000f, 0.9400f}-#define MAP_NO_MAP_MSG {351, -0.0600f, -1.2932f}-#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 352, 2649, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}+#define MAP_TITLE_BACK {2850, 0.2520f, 7.1073f, 1.0000f, 0.6696f, 246}+#define MAP_NO_MAP {2851, 0.0000f, 0.9400f}+#define MAP_NO_MAP_MSG {383, -0.0600f, -1.2932f}+#define MAP_MSG {-1.2900f, -6.8300f, 0.0000f, 0.0420f, 0.9865f, -0.0210f, 384, 2852, 1.9740f, -0.0840f, 1.0000f, 0.6931f, 179}#define MAP_MSG_K 0.7000f#define FIRSTMAP_BG_A 0.6410f-#define FIRSTMAP_TEXTS {{353, 0.0000f, 5.0305f}, {110, 0.0000f, -0.8796f}, {354, 0.0000f, -3.2895f}, {355, 0.0000f, -4.6996f}}-#define FIRSTMAP_PIECES {{2650, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {2651, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {2652, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}-#define FIRSTMAP_KEY {356, 0.0900f, -2.3200f}-#define MAP_WIDE {{{2653, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 357, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{2654, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 358, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{2655, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 359, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}}+#define FIRSTMAP_TEXTS {{385, 0.0000f, 5.0305f}, {135, 0.0000f, -0.8796f}, {386, 0.0000f, -3.2895f}, {387, 0.0000f, -4.6996f}}+#define FIRSTMAP_PIECES {{2853, 0.0000f, 2.1300f, 1.0000f, 1.0000f}, {2854, 0.0000f, 0.0200f, 1.0000f, 0.0771f}, {2855, 0.0000f, -6.4000f, 1.0000f, 1.0000f}}+#define FIRSTMAP_KEY {388, 0.0900f, -2.3200f}+#define MAP_WIDE {{{2856, 3.0400f, -6.6800f, 1.0000f, 1.0000f}, 389, {8.7184f, -6.2919f, 11.0476f}, 4.0000f, -8.6420f, 3.3800f, -7.0700f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{2857, 4.2300f, -8.2600f, 1.0000f, 1.0000f}, 390, {9.9990f, -7.8578f, 11.7784f}, -0.0400f, -7.5800f, 3.0300f, -8.2300f, {1000.0000f, -1000.0000f, 1000.0000f, -1000.0000f}}, {{2858, -0.6100f, -7.9700f, 1.0000f, 1.0000f}, 391, {5.6452f, -7.7738f, 11.8448f}, 16.4200f, -7.3200f, 0.4000f, -8.5800f, {1000.0000f, 17.2600f, 1000.0000f, -6.2200f}}}#define MAP_WIDE_GREY 0x5C#define MAP_WIDE_NAME_GREY 0x5B#define MAP_WIDE_COMPASS_K 0.8700f#define MAP_ZOOM {0.2800f, -2.8000f, 0.4360f, 1.3000f}#define MAP_PAN {-1.4400f, 4.5500f, -8.6420f, -5.5800f}#define MAP_PAN_SPEED 8.0000f-#define MAP_PAN_ARROWS {{2656, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {2656, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {2656, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {2656, 17.1900f, -7.1700f, 1.0f, -90.0000f}}-#define MAP_ACT_CONFIRM {{2657, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {360, 361, 361}}-#define MAP_ACT_MARKER {{2657, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {362, 363, 364}}-#define MAP_ACT_CANCEL {{2657, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {276, 276, 276}}-#define MAP_ACT_CHANGE {{2657, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {365, 365, 365}}-#define MAP_ACT_KEY {{2657, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {366, 367, 368}}-#define MAP_KEY_BB {2658, 13.6200f, 3.4200f, 0.3781f, 1.0000f}+#define MAP_PAN_ARROWS {{2859, 3.9700f, -2.1900f, 1.0f, 0.0000f}, {2859, 4.0400f, -13.4900f, 1.0f, 180.0000f}, {2859, -9.0000f, -7.1700f, 1.0f, 90.0000f}, {2859, 17.1900f, -7.1700f, 1.0f, -90.0000f}}+#define MAP_ACT_CONFIRM {{2860, 15.3897f, -13.3139f, 1.0000f, 0.8889f}, {16.9008f, -13.2878f}, {16.1269f, -13.0221f, 15.3500f}, {392, 393, 393}}+#define MAP_ACT_MARKER {{2860, -6.9500f, -13.3138f, 1.0000f, 0.8889f}, {-8.5394f, -13.2877f}, {-7.7259f, -13.0223f, 7.6740f}, {394, 395, 396}}+#define MAP_ACT_CANCEL {{2860, 15.3897f, -13.3138f, 1.0000f, 0.8889f}, {16.9008f, -13.2877f}, {16.1259f, -13.0223f, 15.3480f}, {306, 306, 306}}+#define MAP_ACT_CHANGE {{2860, -6.9500f, -12.0238f, 1.0000f, 0.8889f}, {-8.5394f, -11.9977f}, {-7.7259f, -11.7323f, 7.6740f}, {397, 397, 397}}+#define MAP_ACT_KEY {{2860, 15.3897f, -12.2039f, 1.0000f, 0.8889f}, {16.9008f, -12.1778f}, {16.3265f, -11.9122f, 15.3500f}, {398, 399, 400}}+#define MAP_KEY_BB {2861, 13.6200f, 3.4200f, 0.3781f, 1.0000f}#define MAP_KEY_STEP -0.8250f-#define MAP_KEY_ROWS {{{2659, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 369, {12.7550f, -1.5413f, 15.3500f}}, {{2660, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 370, {12.7550f, -1.5413f, 15.3500f}}, {{2661, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 371, {12.7550f, -1.5413f, 15.3500f}}, {{2662, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 372, {12.7550f, -1.5413f, 15.3500f}}, {{2663, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 373, {12.7550f, -1.5413f, 15.3500f}}}+#define MAP_KEY_ROWS {{{2862, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 401, {12.7550f, -1.5413f, 15.3500f}}, {{2863, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 402, {12.7550f, -1.5413f, 15.3500f}}, {{2864, 11.7720f, -1.7460f, 1.0000f, 1.0000f}, 403, {12.7550f, -1.5413f, 15.3500f}}, {{2865, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 404, {12.7550f, -1.5413f, 15.3500f}}, {{2866, 11.8600f, -1.7400f, 1.0000f, 1.0000f}, 405, {12.7550f, -1.5413f, 15.3500f}}}#define MAP_KEY_FLAGS {133, 134, 135, 136, 137}#define MAP_KEY_N 5-#define MAP_MM_PIECES {{2664, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {2665, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {2666, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {2667, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}-#define MAP_MM_MARKERS {2668, 2669, 2670, 2671}+#define MAP_MM_PIECES {{2867, 4.0500f, -12.3700f, 1.0000f, 1.0000f}, {2868, 4.0100f, -12.9500f, 0.7510f, 1.0000f}, {2869, 1.9000f, -12.3700f, 1.0000f, 1.0000f}, {2870, 1.9000f, -12.3700f, 1.0000f, 1.0000f}}+#define MAP_MM_MARKERS {2871, 2872, 2873, 2874}#define MAP_MM_AMOUNT {0.0000f, -0.6416f, 1.0614f}#define MAP_MM_ROW {0.0000f, 0.4400f, 1.9000f, 1.4333f, -12.8200f}-#define MAP_MM_PLACE {2672, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}+#define MAP_MM_PLACE {2875, 4.0500f, -7.9900f, -4.9500f, 13.0500f, -10.5500f, -3.5500f, 7.0000f, 20.0000f}#define MAP_MM_RADII 0.8900f#define MAP_MM_UI_PAUSE 0.2000f-#define TXT_KEY_SHIFT 374-#define ROOM_ZONES {5, 9, 9, 9, 9, 24, 24}+#define TXT_KEY_SHIFT 406+#define ROOM_ZONES {5, 9, 9, 9, 9, 24, 24, 9, 9, 9, 9, 9, 9, 9}#define MSG_FIREBALL 0#define MSG_DASH 1-#define SEMI_PERSIST {13, 14, 15, 16, 22, 23, 24, 25, 26}+#define MSG_WALLJUMP 2+#define SEMI_PERSIST {13, 14, 15, 16, 22, 23, 24, 25, 26, 36, 45, 86}diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.hindex 3e20ee1e..1e9407a1 100644--- a/games/hollowknight/src/game.h+++ b/games/hollowknight/src/game.h@@ -42,7 +42,10 @@ enum {PDF_OPENED_CROSSROADS, PDF_OPENED_GREENPATH, PDF_TRAVELLING, PDF_STAG_REMEMBER1, PDF_STAG_CONVO_TISO,PDF_QUIRREL_LEFT_EGG_TEMPLE, PDF_MET_CORNIFER, PDF_CORN_CROSSROADS_ENCOUNTERED, PDF_CORNIFER_INTRODUCED, PDF_MENDER_SIGN_BROKEN,PDF_FALSE_KNIGHT_WALL_REPAIRED, PDF_FALSE_KNIGHT_WALL_BROKEN, PDF_VISITED_FUNGUS, PDF_VISITED_RUINS,- PDF_DEFEATED_MANTIS_LORDS, PDF_MAGE_LORD_DEFEATED, PDF_OPENED_FUNGAL_WASTES, PDF_COUNT+ PDF_DEFEATED_MANTIS_LORDS, PDF_MAGE_LORD_DEFEATED, PDF_OPENED_FUNGAL_WASTES, PDF_HAS_WALLJUMP,+ PDF_CAN_WALL_JUMP, PDF_NOTCH_SHROOM_OGRES, PDF_QUIRREL_LEFT_STATION, PDF_QUIRREL_MANTIS_ENCOUNTERED,+ PDF_ENCOUNTERED_GATEKEEPER, PDF_MAP_FUNGAL_WASTES, PDF_CORN_FUNGAL_WASTES_ENCOUNTERED, PDF_CORN_FUNGAL_WASTES_LEFT,+ PDF_ENTERED_MANTIS_LORD_AREA, PDF_COUNT};typedef struct {/* (saved: the layout only ever grows into reserved) */@@ -253,7 +256,7 @@ enum { TS_WAITING_TO_TRANSITION, TS_EXITING_SCENE, TS_WAITING_TO_ENTER_LEVEL, TSenum { GATE_TOP, GATE_RIGHT, GATE_LEFT, GATE_BOTTOM, GATE_DOOR, GATE_UNKNOWN };enum { SIDE_TOP, SIDE_LEFT, SIDE_RIGHT, SIDE_BOTTOM };enum { ATK_NORMAL, ATK_UP, ATK_DOWN };-enum { SLASH_NORMAL, SLASH_ALT, SLASH_UP, SLASH_DOWN };+enum { SLASH_NORMAL, SLASH_ALT, SLASH_UP, SLASH_DOWN, SLASH_WALL };enum { DAMAGE_FULL, DAMAGE_HAZARD_ONLY, DAMAGE_NONE };#define RECOIL_DURATION 0.2f#define RECOIL_DURATION_STAL 0.08f /* (Stalwart Shell) */@@ -263,7 +266,7 @@ typedef struct { /* HeroControllerStates */bool looking_up, looking_down, looking_up_anim, looking_down_anim, bouncing, recoiling_left, recoiling_right;bool recoiling, recoil_frozen, dead, hazard_death, hazard_respawning, will_hard_land, casting, cast_recoiling;bool prevent_dash, dash_cooldown, in_walk_zone, touching_wall, touching_non_slider, was_on_ground, transitioning;- bool invulnerable, focusing;+ bool invulnerable, focusing, wall_sliding;} CState;typedef struct {@@ -281,6 +284,10 @@ typedef struct {float transition_vx, transition_vy;bool accepting_input, control_relinquished, doing_hazard_respawn, landed_event;bool touching_wall_l, touching_wall_r;+ /* (the Mantis Claw's: sliding down a wall, then the jump off it, its push away held a few steps) */+ bool wall_sliding_l, wall_sliding_r, wall_locked, wall_jumped_l, wall_jumped_r, wall_slashing;+ int wall_lock_steps, wall_unstick_steps;+ float wj_speed, wj_decel;bool hidden, hit_buffered, enter_without_input;float prevent_cast; /* (PreventCastByDialogueEnd: casts kept back a moment) */float parry_t; /* (NailParry: unhurt by enemies a moment) */@@ -397,6 +404,7 @@ void soul_orbs_fling(int n, float x, float y, float smin, float smax, float aminvoid piece_spawn(int sprite, int layer, int order, int flags, float x, float y, float z, float rot, float gravity,float bounce, float spin_factor, float mirror, float vx, float vy, bool resting); /* (obj.c: debris) */void vm_activate_children(uint16_t name, bool on); /* ActivateAllChildren of a script object, by name */+void vm_set_active(uint16_t name, bool on); /* (script objects by name: on, off) *//* the message as an item is taken (msg.c: MSG_*), the HUD Blanker (a white screen the scripts fade) */void msg_show(int item);bool msg_shown(void);diff --git a/games/hollowknight/src/hero.c b/games/hollowknight/src/hero.cindex 4cd1faed..73fea516 100644--- a/games/hollowknight/src/hero.c+++ b/games/hollowknight/src/hero.c@@ -38,6 +38,12 @@#define LANDING_BUFFER_STEPS 5#define LEDGE_BUFFER_STEPS 2#define HEAD_BUMP_STEPS 3+#define WALLSLIDE_SPEED (-8.0f) /* (the Mantis Claw's) */+#define WALLSLIDE_DECEL 0.0f+#define WJ_KICKOFF_SPEED 16.0f+#define WALL_STICKY_STEPS 3+#define WJLOCK_STEPS_SHORT 5+#define WJLOCK_STEPS_LONG 10#define DT 0.02fHero g_hero;@@ -136,6 +142,12 @@ static void cancel_dash(void) {}static void cancel_bounce(void) { g_hero.cs.bouncing = false, g_hero.bounce_timer = 0; }static void cancel_recoil_horizontal(void) { g_hero.cs.recoiling_left = g_hero.cs.recoiling_right = false, g_hero.recoil_steps = 0; }+static void cancel_wallsliding(void) {+ Hero *h = &g_hero;+ h->cs.wall_sliding = false;+ h->wall_sliding_l = h->wall_sliding_r = false;+ h->touching_wall_l = h->touching_wall_r = false;+}static void reset_attacks(void) {Hero *h = &g_hero;h->cs.attacking = h->cs.up_attacking = h->cs.down_attacking = false;@@ -149,8 +161,9 @@ static void cancel_down_attack(void) {}static void reset_motion(void) {Hero *h = &g_hero;- cancel_jump(), cancel_dash(), cancel_bounce(), cancel_recoil_horizontal();+ cancel_jump(), cancel_dash(), cancel_bounce(), cancel_recoil_horizontal(), cancel_wallsliding();h->body.vx = h->body.vy = 0;+ h->wall_locked = false;}static void reset_look(void) {Hero *h = &g_hero;@@ -201,8 +214,8 @@ static void do_hard_landing(void) {/* ---------------------------------------------------------------- abilities */static bool can_jump(void) {Hero *h = &g_hero;- if (h->state == HS_NO_INPUT || h->state == HS_HARD_LANDING || h->state == HS_DASH_LANDING || h->cs.dashing ||- h->cs.jumping || h->cs.bouncing)+ if (h->state == HS_NO_INPUT || h->state == HS_HARD_LANDING || h->state == HS_DASH_LANDING || h->cs.wall_sliding ||+ h->cs.dashing || h->cs.jumping || h->cs.bouncing)return false;if (h->cs.on_ground) return true;if (h->ledge_buffer_steps > 0 && !h->cs.dead && !h->control_relinquished && h->head_bump_steps <= 0 && !check_near_roof()) {@@ -216,7 +229,50 @@ static bool can_dash(void) {Hero *h = &g_hero;return h->state != HS_NO_INPUT && h->state != HS_HARD_LANDING && h->state != HS_DASH_LANDING && h->dash_cooldown_timer <= 0 &&!h->cs.dashing && !(h->cs.attacking && h->attack_time < ATTACK_RECOVERY_TIME) && !h->cs.prevent_dash &&- (h->cs.on_ground || !h->air_dashed) && !h->cs.hazard_death && g_pd.can_dash;+ (h->cs.on_ground || !h->air_dashed || h->cs.wall_sliding) && !h->cs.hazard_death && g_pd.can_dash;+}++/* the Mantis Claw: CanWallSlide, CanWallJump */+static bool can_wall_slide(void) {+ Hero *h = &g_hero;+ if (h->cs.wall_sliding && g_game.paused) return true;+ return !h->cs.touching_non_slider && !h->cs.dashing && pd_flag(PDF_HAS_WALLJUMP) && !h->cs.on_ground && !h->cs.recoiling &&+ !g_game.paused && !h->control_relinquished && !h->cs.transitioning && (h->cs.falling || h->cs.wall_sliding) &&+ h->accepting_input;+}++static bool can_wall_jump(void) {+ Hero *h = &g_hero;+ if (!pd_flag(PDF_HAS_WALLJUMP) || h->cs.touching_non_slider) return false;+ return h->cs.wall_sliding || (h->cs.touching_wall && !h->cs.on_ground);+}++/* the Wall Puff: a child of the Knight's, let go where it shows (at the wall), as he jumps off it */+static struct {+ bool on;+ float x, y, sx;+ Anim anim;+} puff;++static void do_wall_jump(void) {+ Hero *h = &g_hero;+ if (h->touching_wall_l) face_right(), h->wall_jumped_r = true, h->wall_jumped_l = false;+ else if (h->touching_wall_r) face_left(), h->wall_jumped_r = false, h->wall_jumped_l = true;+ cancel_wallsliding();+ h->cs.touching_wall = false;+ h->touching_wall_l = h->touching_wall_r = false;+ h->air_dashed = false;+ h->wj_speed = WJ_KICKOFF_SPEED;+ h->wj_decel = (WJ_KICKOFF_SPEED - RUN_SPEED) / WJLOCK_STEPS_LONG;+ h->cs.jumping = true;+ h->wall_lock_steps = 0;+ h->wall_locked = true;+ h->jump_queue_steps = 0;+ h->jumped_steps = 0;+ /* (its FSM: at its place on the Knight as he now faces, then on its own) */+ float k = h->cs.facing_right ? -1.0f : 1.0f;+ puff.on = true, puff.x = h->body.x + k * 0.91f, puff.y = h->body.y - 0.32f, puff.sx = k * 1.4208f;+ anim_play_from_frame(&puff.anim, CLIP_KNIGHT_WALLJUMP_PUFF, 0);}static bool can_attack(void) {@@ -242,7 +298,8 @@ static void hero_dash(void) {cancel_bounce();reset_look();h->cs.recoiling = false;- if (held(K_RIGHT)) face_right();+ if (h->cs.wall_sliding) flip_sprite();+ else if (held(K_RIGHT)) face_right();else if (held(K_LEFT)) face_left();h->cs.dashing = true;h->dash_queue_steps = 0;@@ -256,7 +313,10 @@ static void attack(int dir) {h->cs.attacking = true;h->attack_duration = ATTACK_DURATION;int kind;- if (dir == ATK_NORMAL) {+ h->wall_slashing = h->cs.wall_sliding;+ if (h->cs.wall_sliding)+ kind = SLASH_WALL; /* (away from the wall) */+ else if (dir == ATK_NORMAL) {kind = h->cs.alt_attack ? SLASH_ALT : SLASH_NORMAL;h->cs.alt_attack = !h->cs.alt_attack;} else if (dir == ATK_UP) {@@ -329,10 +389,11 @@ static void terrain_thunk(void) {Hero *h = &g_hero;if (h->thunk_timer <= 0) return;if (!h->thunk_hit) {- float len = (h->thunk_dir == ATK_NORMAL ? 2.0f : 1.5f) * (charm_on(18) ? 1.2f : 1.0f); /* (Longnail) */+ /* (Longnail, Mark of Pride) */+ float len = (h->thunk_dir == ATK_NORMAL ? 2.0f : 1.5f) * (1 + (charm_on(18) ? 0.2f : 0) + (charm_on(13) ? 0.3f : 0));float hs = 0.225f; /* the 0.45 box cast */float ox = bcx(), oy = bcy() + 0.25f, dx = 0, dy = 0;- if (h->thunk_dir == ATK_NORMAL) dx = h->cs.facing_right ? 1 : -1;+ if (h->thunk_dir == ATK_NORMAL) dx = h->cs.facing_right != h->cs.wall_sliding ? 1 : -1;else if (h->thunk_dir == ATK_UP) oy = bmax_y(), dy = 1;else oy = bmin_y(), dy = -1;/* (a box cast, as three rays across the box: the nearest ground; not a NonThunker's) */@@ -357,7 +418,7 @@ static void terrain_thunk(void) {static void move(float dir) {Hero *h = &g_hero;if (h->cs.on_ground) set_state(HS_GROUNDED);- if (h->accepting_input) h->body.vx = dir * (h->cs.in_walk_zone ? WALK_SPEED : RUN_SPEED);+ if (h->accepting_input && !h->cs.wall_sliding) h->body.vx = dir * (h->cs.in_walk_zone ? WALK_SPEED : RUN_SPEED);}static void jump(void) {@@ -420,7 +481,7 @@ static void fixed_update(void) {}if (!h->cs.dashing) {move(h->move_input);- if (!h->cs.attacking || h->attack_time >= ATTACK_RECOVERY_TIME) {+ if ((!h->cs.attacking || h->attack_time >= ATTACK_RECOVERY_TIME) && !h->cs.wall_sliding && !h->wall_locked) {if (h->move_input > 0 && !h->cs.facing_right) flip_sprite(), cancel_attack();else if (h->move_input < 0 && h->cs.facing_right) flip_sprite(), cancel_attack();}@@ -441,11 +502,39 @@ static void fixed_update(void) {else h->body.vx = h->body.vy = 0;}if (h->cs.bouncing) h->body.vy = BOUNCE_VELOCITY;+ if (h->wall_locked) {+ /* (off a wall: pushed away, less and less, a few steps) */+ if (h->wall_jumped_r) h->body.vx = h->wj_speed;+ else if (h->wall_jumped_l) h->body.vx = -h->wj_speed;+ if (++h->wall_lock_steps > WJLOCK_STEPS_LONG) h->wall_locked = false;+ h->wj_speed -= h->wj_decel;+ }+ if (h->cs.wall_sliding) {+ /* (held away from the wall a few steps, or off it: no longer sliding) */+ if ((h->wall_sliding_l && held(K_RIGHT)) || (h->wall_sliding_r && held(K_LEFT))) h->wall_unstick_steps++;+ else h->wall_unstick_steps = 0;+ if (h->wall_unstick_steps >= WALL_STICKY_STEPS) cancel_wallsliding();+ if (h->wall_sliding_l) {+ if (!check_still_touching_wall(1, false)) flip_sprite(), cancel_wallsliding();+ } else if (h->wall_sliding_r && !check_still_touching_wall(0, false))+ flip_sprite(), cancel_wallsliding();+ }}if (h->body.vy < -MAX_FALL_VELOCITY && !h->control_relinquished) h->body.vy = -MAX_FALL_VELOCITY;if (h->jump_queuing) h->jump_queue_steps++;if (h->dash_queuing) h->dash_queue_steps++;if (h->attack_queuing) h->attack_queue_steps++;+ if (h->cs.wall_sliding) {+ /* (sliding down it no faster than WALLSLIDE_SPEED) */+ if (h->body.vy > WALLSLIDE_SPEED) {+ h->body.vy -= WALLSLIDE_DECEL;+ if (h->body.vy < WALLSLIDE_SPEED) h->body.vy = WALLSLIDE_SPEED;+ }+ if (h->body.vy < WALLSLIDE_SPEED) {+ h->body.vy += WALLSLIDE_DECEL;+ if (h->body.vy < WALLSLIDE_SPEED) h->body.vy = WALLSLIDE_SPEED;+ }+ }if (h->landing_buffer_steps > 0) h->landing_buffer_steps--;if (h->ledge_buffer_steps > 0) h->ledge_buffer_steps--;if (h->head_bump_steps > 0) h->head_bump_steps--;@@ -554,6 +643,24 @@ static void look_for_input(void) {if (!h->accepting_input || g_game.paused) return;h->move_input = held(K_RIGHT) && !held(K_LEFT) ? 1.0f : held(K_LEFT) && !held(K_RIGHT) ? -1.0f : 0.0f;h->vertical_input = held(K_UP) && !held(K_DOWN) ? 1.0f : held(K_DOWN) && !held(K_UP) ? -1.0f : 0.0f;+ if (pd_flag(PDF_HAS_WALLJUMP) && can_wall_slide() && !h->cs.attacking) {+ /* (falling against a wall, held towards it: sliding down it) */+ if (h->touching_wall_l && held(K_LEFT) && !h->cs.wall_sliding) {+ h->air_dashed = false;+ h->cs.wall_sliding = true, h->cs.will_hard_land = false;+ h->wall_sliding_l = true, h->wall_sliding_r = false;+ face_left();+ }+ if (h->touching_wall_r && held(K_RIGHT) && !h->cs.wall_sliding) {+ h->air_dashed = false;+ h->cs.wall_sliding = true, h->cs.will_hard_land = false;+ h->wall_sliding_l = false, h->wall_sliding_r = true;+ face_right();+ }+ }+ if (h->cs.wall_sliding && pressed(K_DOWN)) cancel_wallsliding(), flip_sprite();+ if (h->wall_locked && h->wall_jumped_l && held(K_RIGHT) && h->wall_lock_steps >= WJLOCK_STEPS_SHORT) h->wall_locked = false;+ if (h->wall_locked && h->wall_jumped_r && held(K_LEFT) && h->wall_lock_steps >= WJLOCK_STEPS_SHORT) h->wall_locked = false;if (!held(K_JUMP)) jump_released();if (!held(K_DASH)) {if (h->cs.prevent_dash && !h->cs.dash_cooldown) h->cs.prevent_dash = false;@@ -566,7 +673,8 @@ static void look_for_queue_input(void) {Hero *h = &g_hero;if (!h->accepting_input || g_game.paused) return;if (pressed(K_JUMP)) {- if (can_jump()) hero_jump();+ if (can_wall_jump()) do_wall_jump();+ else if (can_jump()) hero_jump();else h->jump_queue_steps = 0, h->jump_queuing = true;}if (pressed(K_DASH)) {@@ -639,6 +747,13 @@ static void update(void) {}}look_for_queue_input();+ if (h->cs.wall_sliding) {+ h->air_dashed = false;+ if (h->cs.on_ground) flip_sprite(), cancel_wallsliding();+ if (!h->cs.touching_wall) flip_sprite(), cancel_wallsliding();+ if (!can_wall_slide()) cancel_wallsliding();+ }+ if (h->wall_slashing && !h->cs.wall_sliding) cancel_attack();if (h->attack_cooldown > 0) h->attack_cooldown -= DT;if (h->dash_cooldown_timer > 0) h->dash_cooldown_timer -= DT;terrain_thunk();@@ -717,11 +832,14 @@ static void animation(void) {else if (h->cs.attacking) {if (h->cs.up_attacking) play(CLIP_KNIGHT_UPSLASH);else if (h->cs.down_attacking) play(CLIP_KNIGHT_DOWNSLASH);+ else if (h->cs.wall_sliding) play(CLIP_KNIGHT_WALL_SLASH);else if (!h->cs.alt_attack) play(CLIP_KNIGHT_SLASH);else play(CLIP_KNIGHT_SLASHALT);} else if (h->cs.casting) {/* (the spell's own animation plays) */- } else if (h->anim_state == HS_IDLE) {+ } else if (h->cs.wall_sliding)+ play(CLIP_KNIGHT_WALL_SLIDE);+ else if (h->anim_state == HS_IDLE) {if (h->cs.looking_up_anim && !anim_is_playing(a, CLIP_KNIGHT_LOOKUP)) play(CLIP_KNIGHT_LOOKUP);else if (h->cs.looking_down_anim) play(CLIP_KNIGHT_LOOKDOWN);else if (!h->cs.looking_up_anim && !h->cs.looking_down_anim && can_play_idle()) play_idle();@@ -735,7 +853,9 @@ static void animation(void) {play(CLIP_KNIGHT_RUN);}} else if (h->anim_state == HS_AIRBORNE) {- if (h->cs.jumping) {+ if (h->wall_locked)+ play(CLIP_KNIGHT_WALLJUMP);+ else if (h->cs.jumping) {if (!anim_is_playing(a, CLIP_KNIGHT_AIRBORNE)) anim_play_from_frame(a, CLIP_KNIGHT_AIRBORNE, 0);} else if (h->cs.falling) {if (!anim_is_playing(a, CLIP_KNIGHT_AIRBORNE)) anim_play_from_frame(a, CLIP_KNIGHT_AIRBORNE, 5);@@ -759,6 +879,7 @@ void hero_init(float x, float y, bool facing_right) {Hero *h = &g_hero;static BodyEvent events[MAX_EVENTS];memset(h, 0, sizeof *h);+ puff.on = false;entering_stop(); /* (a way into a room not finished: over) */spell_reset();h->entry_gate = -1;@@ -815,6 +936,11 @@ void hero_update(void) {if (!(h->anim.clip == CLIP_KNIGHT_LAND || h->anim.clip == CLIP_KNIGHT_RUN_TO_IDLE || h->anim.clip == CLIP_KNIGHT_DASH_TO_IDLE))h->complete_delegate = false;slash_tick();+ if (puff.on) {+ puff.anim.events = 0;+ anim_update(&puff.anim, DT);+ if (puff.anim.events & ANIM_DONE) puff.on = false;+ }}void hero_draw(void) {@@ -828,8 +954,12 @@ void hero_draw(void) {sprite_inst(SPRITE_HERO_LIGHT, h->body.x, h->body.y - 0.6f, 0.004f + 0.0312f, 1, 1, gfx_dyn_tint(1, c[0], c[1], c[2], c[3]), &li);li.flags = (uint8_t)((li.flags & ~F_BLEND) | BL_LINEARLIGHT);gfx_actor(&li, SORT_KEY(0, 0));- if (h->hidden) return;Inst in;+ if (puff.on && puff.anim.sprite >= 0) {+ sprite_inst(puff.anim.sprite, puff.x, puff.y, 0.005f, puff.sx, 1.4208f, 0, &in);+ gfx_actor(&in, SORT_KEY(0, 0));+ }+ if (h->hidden) return;/* (InvulnerablePulse: the color towards its invulnerable one) */uint8_t tint = 0;if (h->pulsing) tint = gfx_dyn_tint(0, 255, 255, 255, (uint8_t)(255 - 255 * 0.5f * h->pulse_t / 0.1f));@@ -864,15 +994,20 @@ void hero_die(void) {/* ---------------------------------------------------------------- NailSlash: the slash effect, a child of the Knight */static const struct {- int clip, fury; /* (its animation; " F": while the Fury is on) */+ int clip, fury, mantis; /* (its animation; " F": while the Fury is on; " M": with Mark of Pride) */float x, y, z, sx, sy; /* its place and scale on the Knight */-} slashes[4] = {- {CLIP_KNIGHT_SLASHEFFECT, CLIP_KNIGHT_SLASHEFFECT_F, -0.01f, -0.41f, -0.001f, 1.6010780f, 1.6452440f},- {CLIP_KNIGHT_SLASHEFFECTALT, CLIP_KNIGHT_SLASHEFFECTALT_F, 0.08f, -0.436f, -0.001f, 1.2569700f, 1.4224339f},- {CLIP_KNIGHT_UPSLASHEFFECT, CLIP_KNIGHT_UPSLASHEFFECT_F, 0.0f, 0.69f, -0.001f, 1.15f, 1.4f},- {CLIP_KNIGHT_DOWNSLASHEFFECT, CLIP_KNIGHT_DOWNSLASHEFFECT_F, 0.16f, -1.59f, 0.0f, 1.125f, 1.28002f},+} slashes[5] = {+ {CLIP_KNIGHT_SLASHEFFECT, CLIP_KNIGHT_SLASHEFFECT_F, CLIP_KNIGHT_SLASHEFFECT_M, -0.01f, -0.41f, -0.001f, 1.6010780f, 1.6452440f},+ {CLIP_KNIGHT_SLASHEFFECTALT, CLIP_KNIGHT_SLASHEFFECTALT_F, CLIP_KNIGHT_SLASHEFFECTALT_M, 0.08f, -0.436f, -0.001f, 1.2569700f,+ 1.4224339f},+ {CLIP_KNIGHT_UPSLASHEFFECT, CLIP_KNIGHT_UPSLASHEFFECT_F, CLIP_KNIGHT_UPSLASHEFFECT_M, 0.0f, 0.69f, -0.001f, 1.15f, 1.4f},+ {CLIP_KNIGHT_DOWNSLASHEFFECT, CLIP_KNIGHT_DOWNSLASHEFFECT_F, CLIP_KNIGHT_DOWNSLASHEFFECT_M, 0.16f, -1.59f, 0.0f, 1.125f, 1.28002f},+ /* (WallSlash: from a wall, the other way) */+ {CLIP_KNIGHT_SLASHEFFECT, CLIP_KNIGHT_SLASHEFFECT_F, CLIP_KNIGHT_SLASHEFFECT_M, 0.04f, -0.41f, -0.001f, -1.62f, 1.6452f},};-#define LONGNAIL 1.15f /* (NailSlash.StartSlash: Longnail's scale) */+#define LONGNAIL 1.15f /* (NailSlash.StartSlash: Longnail's scale, Mark of Pride's, both's) */+#define MANTIS 1.25f+#define MANTIS_LONGNAIL 1.4fstatic struct {int kind;float k; /* (its scale: Longnail's) */@@ -884,8 +1019,9 @@ static struct {void slash_start(int kind) {sl.kind = kind;- sl.k = charm_on(18) ? LONGNAIL : 1;- int clip = g_hero.fury ? slashes[kind].fury : slashes[kind].clip;+ bool mantis = charm_on(13), longnail = charm_on(18);+ sl.k = mantis && longnail ? MANTIS_LONGNAIL : mantis ? MANTIS : longnail ? LONGNAIL : 1;+ int clip = g_hero.fury ? slashes[kind].fury : mantis ? slashes[kind].mantis : slashes[kind].clip;anim_play(&sl.anim, clip);anim_play_from_frame(&sl.anim, clip, 0);sl.step_counter = sl.poly_counter = 0;@@ -915,7 +1051,7 @@ static void slash_fixed(void) {}/* the slash's PolygonCollider2D (local, before its scale) */-static const float slash_poly[4][12] = {+static const float slash_poly[5][12] = {{-1.2709147f, 0.7413744f, -1.9154043f, 0.3402300f, -2.0418284f, -0.1750279f, -1.6737577f, -0.4435550f, -0.0747072f,-0.6419125f, 0.0078668f, 0.9683739f},{-1.2172120f, 0.9806359f, -2.3899105f, 0.5705993f, -2.6464114f, -0.0792437f, -2.1236799f, -0.5379019f, -0.3672335f,@@ -924,6 +1060,7 @@ static const float slash_poly[4][12] = {-0.8659905f, -1.0722543f, 0.6188976f},{1.2783164f, 0.6065824f, 1.1190680f, -0.8765929f, 0.5875434f, -1.6216662f, -0.4472086f, -1.6460726f, -1.0696145f,-0.7312644f, -1.3820535f, 0.6370943f},+ {-1.2709f, 0.7414f, -1.9154f, 0.3402f, -2.0418f, -0.175f, -1.7475f, -0.487f, -0.1562f, -0.7891f, -0.0682f, 1.0156f},};/* the hazards a slash touches that a down slash bounces off (spikes: on the Hero Attack layer), as HB_BOUNCE */@@ -957,7 +1094,7 @@ static void slash_hits(void) {pts[2 * i] = h->body.x + k * (s->x + s->sx * sl.k * slash_poly[sl.kind][2 * i]);pts[2 * i + 1] = h->body.y + s->y + s->sy * sl.k * slash_poly[sl.kind][2 * i + 1];}- float direction = sl.kind == SLASH_UP ? 90 : sl.kind == SLASH_DOWN ? 270 : h->cs.facing_right ? 0 : 180;+ float direction = sl.kind == SLASH_UP ? 90 : sl.kind == SLASH_DOWN ? 270 : (h->cs.facing_right != (sl.kind == SLASH_WALL)) ? 0 : 180;int fl = obj_nail(pts, 6, direction);if (direction == 270 && !(fl & HB_BOUNCE)) fl |= hazards_nail(pts, 6);if (direction == 0 && (fl & HB_RECOIL)) hero_recoil_left();@@ -1508,6 +1645,8 @@ void hero_relinquish_control_not_velocity(void) {Hero *h = &g_hero;if (h->control_relinquished || h->cs.dead) return;reset_input();+ cancel_wallsliding(); /* (ResetMotionNotVelocity: off the wall) */+ h->wall_locked = false;h->accepting_input = false;h->control_relinquished = true;reset_look();diff --git a/games/hollowknight/src/inv.c b/games/hollowknight/src/inv.cindex a8e3c779..df701e5a 100644--- a/games/hollowknight/src/inv.c+++ b/games/hollowknight/src/inv.c@@ -79,10 +79,10 @@ static const NameDesc txt_heart[6] = TXT_INV_HEART, txt_vessel[5] = TXT_INV_VESStxt_eq[] = TXT_INV_EQ, txt_trinkets[4] = TXT_INV_TRINKETS;static const int16_t txt_quill[4] = TXT_INV_QUILL;#define NEQ ((int)(sizeof inv_eq / sizeof inv_eq[0]))-enum { EQ_DASH, EQ_LANTERN, EQ_MAP, EQ_CITY_KEY, EQ_SIMPLE_KEY, EQ_RANCID_EGG };+enum { EQ_DASH, EQ_WALLJUMP, EQ_LANTERN, EQ_MAP, EQ_CITY_KEY, EQ_SIMPLE_KEY, EQ_RANCID_EGG };/* (charmCost_N, as PlayerData starts) */-static const uint8_t costs[41] = {[1] = 1, [2] = 1, [3] = 1, [4] = 2, [6] = 2, [7] = 3, [8] = 2, [14] = 1, [18] = 2,+static const uint8_t costs[41] = {[1] = 1, [2] = 1, [3] = 1, [4] = 2, [6] = 2, [7] = 3, [8] = 2, [13] = 3, [14] = 1, [18] = 2,[19] = 3, [20] = 2};int charm_cost(int id) { return id > 0 && id <= 40 ? costs[id] : 0; }bool charm_equipped(int id) { return id > 0 && id <= 40 && pd_flag(PDF_EQUIPPED_CHARM_1 + id - 1); }@@ -93,7 +93,7 @@ enum { P_INV, P_CHARMS, P_JOURNAL, P_MAP, NPANES };/* the Charms pane's places for the cursor: the collection, the equipped row, the arrows; its charm's moves */enum { CA_COLLECTION, CA_EQUIPPED, CA_ARROW_L, CA_ARROW_R };enum { TW_NONE, TW_UP, TW_DOWN, TW_FAIL, TW_FAIL_BACK };-#define MAX_INV_ITEMS (NFIXED + 6 + 4)+#define MAX_INV_ITEMS (NFIXED + 7 + 4)static struct {uint8_t st, pane, prev_pane;@@ -216,7 +216,7 @@ static void build_items(Items *l) {}int slot = 0;for (int k = 0; k < NEQ; k++) {- bool has = k == EQ_DASH ? g_pd.has_dash : k == EQ_LANTERN ? pd_flag(PDF_HAS_LANTERN)+ bool has = k == EQ_DASH ? g_pd.has_dash : k == EQ_WALLJUMP ? pd_flag(PDF_HAS_WALLJUMP) : k == EQ_LANTERN ? pd_flag(PDF_HAS_LANTERN): k == EQ_MAP ? (pd_flag(PDF_HAS_MAP) || pd_flag(PDF_HAS_QUILL)) : k == EQ_CITY_KEY ? pd_flag(PDF_HAS_CITY_KEY): k == EQ_SIMPLE_KEY ? g_pd.simple_keys > 0 : g_pd.rancid_eggs > 0;if (!has) continue;diff --git a/games/hollowknight/src/msg.c b/games/hollowknight/src/msg.cindex 1250fb91..aafbc378 100644--- a/games/hollowknight/src/msg.c+++ b/games/hollowknight/src/msg.c@@ -9,7 +9,11 @@#define HUD_PX (FOCAL / (-1.342f - CAM_Z))static const int16_t table[][6] = MSG_TABLE; /* (name, prefix, Tap or Press, the two lines, the key's name) */-static const int16_t icons[] = {SPRITE_MSG_ICON_FIREBALL, SPRITE_MSG_ICON_DASH};+static const int16_t icons[] = {SPRITE_MSG_ICON_FIREBALL, SPRITE_MSG_ICON_DASH+#ifdef HK_FW+ , SPRITE_MSG_ICON_WALLJUMP+#endif+};enum { MS_OFF, MS_TOP_UP, MS_BOT_UP, MS_STOP_UP, MS_DETECT, MS_DOWN };/* (color_fader: what fades together; each its delay going up) */diff --git a/games/hollowknight/src/obj.c b/games/hollowknight/src/obj.cindex f42dce83..04f9e094 100644--- a/games/hollowknight/src/obj.c+++ b/games/hollowknight/src/obj.c@@ -487,6 +487,7 @@ enum { AR_DETECT, AR_FIGHT, AR_WAVE_PAUSE, AR_WAVE2, AR_END_WAIT, AR_DONE };static struct {int16_t ent; /* (-1: none) */uint8_t st;+ bool dropped; /* (its item: Drop Item) */int16_t count; /* Battle Enemies */float t;} arena;@@ -512,10 +513,14 @@ static void arena_enter(void) {arena.count = (int16_t)e->p2;/* Init: its camera lock off; Activate if its fight is over */if (e->p0 >= 0) ent_set_enabled((int)e->p0, false);+ arena.dropped = false;if (persist_get(e->persist)) {arena.st = AR_DONE;if (e->a & ARF_DESTROY_GATES) gates_event(BG_DESTROY);else if (e->a & ARF_QUICK_OPEN) gates_event(BG_QUICK_OPEN);+#ifdef HK_FW+ if ((e->a & ARF_WAKE) && e->s0) vm_set_active(VMSTR_ARENA_ITEM_KEPT, true); /* (Activate: Completed on, its item) */+#endif} elsearena.st = (e->a & ARF_NO_START) ? AR_FIGHT : AR_DETECT; /* (no start: counting at once) */}@@ -579,7 +584,12 @@ static void arena_tick(void) {if (arena.count <= 0) arena.st = AR_END_WAIT, arena.t = 0;break;case AR_END_WAIT:- if ((arena.t += DT) >= e->p3) {+ arena.t += DT;+#ifdef HK_FW+ if ((e->a & ARF_WAKE) && e->s0 && !arena.dropped && arena.t >= e->p3 - e->s0 * 0.01f)+ arena.dropped = true, vm_set_active(VMSTR_ARENA_ITEM, true); /* (Drop Item: its item, then a wait) */+#endif+ if (arena.t >= e->p3) {/* End: Activated, the gates open, its camera lock off */persist_set(e->persist);gates_event(BG_OPEN);diff --git a/games/hollowknight/src/spell.c b/games/hollowknight/src/spell.cindex 1f2e5ee1..5643f60b 100644--- a/games/hollowknight/src/spell.c+++ b/games/hollowknight/src/spell.c@@ -237,9 +237,10 @@ bool spell_busy(void) { return sp.state != SP_INACTIVE && sp.state != SP_BUTTON_void spell_cast(bool up, bool down) {(void)up, (void)down;if (g_pd.mp < MP_COST || !hero_can_cast() || g_pd.fireball_level <= 0) return;- /* Wallside? (no wall sliding here), Fireball Antic: the Knight held still in the air */+ /* Wallside?: on a wall, turned away from it; Fireball Antic: the Knight held still in the air */Hero *h = &g_hero;sp.can_cancel = true;+ if (h->cs.wall_sliding) hero_face(!h->cs.facing_right);anim_play_from_frame(&h->anim, CLIP_KNIGHT_FIREBALL_ANTIC, 0);hero_relinquish_control();hero_stop_anim_control();diff --git a/games/hollowknight/src/vm.c b/games/hollowknight/src/vm.cindex 36968026..66884c44 100644--- a/games/hollowknight/src/vm.c+++ b/games/hollowknight/src/vm.c@@ -238,6 +238,7 @@ static int pd_int(int i) {case 22: return (int)g_pd.stag_position1 - 1;case 23: return g_pd.stations_opened;case 25: return g_pd.mender_state;+ case 26: return g_pd.charm_slots;default: return 0;}}@@ -260,6 +261,7 @@ static void pd_set_int(int i, int v) {case 22: g_pd.stag_position1 = (uint8_t)(v + 1); break;case 23: g_pd.stations_opened = (uint8_t)v; break;case 25: g_pd.mender_state = (uint8_t)v; break;+ case 26: g_pd.charm_slots = (uint8_t)v; break;}}@@ -1475,6 +1477,10 @@ static bool act(Fsm *f, const uint8_t *a, int mode) {case 25: hero_add_mp_charge((int)a0); break; /* (TryAddMPChargeSpa) */case 26: hero_recoil_left(); break;case 27: hero_recoil_right(); break;+ case 28: hero_charm_update(); break; /* (CharmUpdate) */+ case 29: /* (RefreshOvercharm: a notch more, no longer overcharmed) */+ if (pd_flag(PDF_OVERCHARMED) && g_pd.charm_slots_filled <= g_pd.charm_slots) pd_set_flag(PDF_OVERCHARMED, false);+ break;case 21: {/* (GetState: tools/vm.py's HERO_STATES) */int k = (int)a0;@@ -1661,6 +1667,12 @@ static float ease(int type, float k) {}}+/* the objects the game names on or off (an arena's item: tools/vm.py's VM_NAMES) */+void vm_set_active(uint16_t name, bool on) {+ for (int o = 0; o < vm.nobjs; o++)+ if (vm.rec[o].name == name && !(vm.objs[o].flags & OF_COND_OFF)) obj_set_active(o, on);+}+/* ActivateAllChildren of an object the game names (Hornet's Hornet Saver) */void vm_activate_children(uint16_t name, bool on) {for (int o = 0; o < vm.nobjs; o++)diff --git a/games/hollowknight/tools/actors.py b/games/hollowknight/tools/actors.pyindex 72372034..e7e8ac63 100644--- a/games/hollowknight/tools/actors.py+++ b/games/hollowknight/tools/actors.py@@ -21,6 +21,9 @@ KNIGHT = ("resources.assets", 20600, ["Collect Magical 1", "Collect Magical 2", "Collect Magical 3", "Collect Magical Fall", "Collect Magical Land","Collect Heart Piece", "Collect Heart Piece End", "Collect StandToIdle", "GetUpToIdle", "Death Head Cracked","Dreamer Land", "Super Hard Land",+ # (the Mantis Claw's: sliding down a wall, the jump off it, a slash from it, its puff; Mark of Pride's slashes)+ "Wall Slide", "Walljump", "Wall Slash", "Walljump Puff", "SlashEffect M", "SlashEffectAlt M", "UpSlashEffect M",+ "DownSlashEffect M",])# enemy kinds: name, the FSM (or component) that runs them, their library, the C code for that FSM, and the clips each@@ -260,6 +263,8 @@ def named_sprites(sprites):# clips drawn bigger than their sprites (the object's scale): their frames are kept that much finerDRAWN_SCALE = {"Arrow Up": 1.3, "Arrow Down": 1.3, "Stop Up": 1.3, "Stop Down": 1.3, "Dream Up": 1.0745, "Dream Down": 1.0745, "SlashEffect": 1.645, "SlashEffectAlt": 1.422, "UpSlashEffect": 1.4, "DownSlashEffect": 1.28,"SlashEffect F": 1.645, "SlashEffectAlt F": 1.422, "UpSlashEffect F": 1.4, "DownSlashEffect F": 1.28,+ "SlashEffect M": 1.645, "SlashEffectAlt M": 1.422, "UpSlashEffect M": 1.4, "DownSlashEffect M": 1.28,+ "Walljump Puff": 1.4208,"Blast": 1.4, "Ball": 1.45, "Ball End": 1.45, "Fireball Wall Impact": 2.0,"Lamp_Bug_idle": 1.5 * 1.4838, "Shop_Menu_Top Up": 1.124, "Shop_Menu_Top Down": 1.124,"Shop_Menu_Bottom Up": 1.134, "Shop_Menu_Bottom Down": 1.134, "Small Idle": 1.5, "Small Air": 1.5, "Med Idle": 1.5, "Med Air": 1.5, "Large Idle": 1.5, "Large Air": 1.5,diff --git a/games/hollowknight/tools/ents.py b/games/hollowknight/tools/ents.pyindex 07cdfcfb..a0f6ef29 100644--- a/games/hollowknight/tools/ents.py+++ b/games/hollowknight/tools/ents.py@@ -1000,8 +1000,10 @@ def room(d, rooms, strings, persist, name, sprites=None, owners=None, rec_base=0hp_at = _param(a, "integer2") or 0elif a["name"] == "Wait" and ev("finishEvent") == "NEXT":give_up = _param(a, "time") or 0- # (Drop Item: its wait before End)- wait += next((_param(a, "time") for a in acts("Drop Item") if a["name"] == "Wait"), 0)+ # (Drop Item: its wait before End, its item shown as it starts (s0, in 100ths)+ drop = next((_param(a, "time") for a in acts("Drop Item") if a["name"] == "Wait"), 0)+ wait += drop+ pause = dropif _state(f, "Complete") and not _state(f, "Start"):# (no start: done once its count is down, the gates opening a while after)fl |= ARF_NO_STARTdiff --git a/games/hollowknight/tools/inv.py b/games/hollowknight/tools/inv.pyindex 80a823e8..3827c978 100644--- a/games/hollowknight/tools/inv.py+++ b/games/hollowknight/tools/inv.py@@ -7,7 +7,7 @@ import unity, tk2d, textROOT = "_GameCameras/HudCamera/Inventory/"# the items the Inventory pane lists after the fixed ones (Build Equipment List: its order), by what has them:# (object, its name and description, the PlayerData that has it: a bool, or an int above 0)-EQUIPMENT = [("Dash Cloak", "DASH", "hasDash"), ("Lantern", "LANTERN", "hasLantern"),+EQUIPMENT = [("Dash Cloak", "DASH", "hasDash"), ("Mantis Claw", "WALLJUMP", "hasWalljump"), ("Lantern", "LANTERN", "hasLantern"),("Map and Quill", "MAP", "hasMap"), ("City Key", "CITYKEY", "hasCityKey"), ("Simple Key", "SIMPLEKEY", "simpleKeys"),("Rancid Egg", "RANCIDEGG", "rancidEggs")]# (the map and the quill: Map's sprite, then its own, as they are had)diff --git a/games/hollowknight/tools/pack.py b/games/hollowknight/tools/pack.pyindex d6f0d5e5..bdf6100c 100644--- a/games/hollowknight/tools/pack.py+++ b/games/hollowknight/tools/pack.py@@ -514,6 +514,8 @@ def main():fleurs["SPRITE_MSG_" + name] = SPRITES.id(pmsg, ref or sr["m_Sprite"], max(o["lscale"][:2]), res)fleurs["SPRITE_MSG_ICON_FIREBALL"] = SPRITES.id(unity.scene("Crossroads_ShamanTemple"), [4, 44], 1.5607, hud_res)fleurs["SPRITE_MSG_ICON_DASH"] = SPRITES.id(unity.scene("Fungus1_04"), [10, 22], 1.5607, hud_res)+ if PART == 2:+ fleurs["SPRITE_MSG_ICON_WALLJUMP"] = SPRITES.id(unity.scene("Fungus2_14"), [4, 337], 1.5607, hud_res)# (a Moss Knight's grass ball: a Unity sprite)pgb = unity.prefab("sharedassets149.assets", 34)fleurs["SPRITE_GRASS_BALL"] = SPRITES.id(pgb, next(c["v"] for c in pgb["objects"][0]["c"] if c["type"] == "SpriteRenderer")["m_Sprite"], 1)@@ -852,7 +854,7 @@ def main():for e in vm.NAMED_EVENTS: # (each room's number for it; 255: its scripts don't know it)ids = [vm.BUILT[r].named_events.get(e, 255) if r in vm.BUILT else 255 for r in ROOMS]f.write("#define VMEV_%s {%s}\n" % (e.upper().replace(" ", "_"), ", ".join(str(i) for i in ids)))- for name in ("NPC Title", "Visited", "Display Right", "Hornet Saver", "Item"):+ for name in ("NPC Title", "Visited", "Display Right", "Hornet Saver", "Item") + (("Arena Item", "Arena Item Kept") if PART == 2 else ()):f.write("#define VMSTR_%s %d\n" % (name.upper().replace(" ", "_"), vm.STR.index[name]))for name, i in str_ids.items():f.write("#define STR_%s %d\n" % (name.upper().replace(" ", "_"), i))diff --git a/games/hollowknight/tools/rooms_fw.txt b/games/hollowknight/tools/rooms_fw.txtindex 69eb12a2..3a2c5d95 100644--- a/games/hollowknight/tools/rooms_fw.txt+++ b/games/hollowknight/tools/rooms_fw.txt@@ -5,3 +5,12 @@ Fungus2_04Fungus2_03Fungus2_01Fungus2_02+Fungus2_18+Fungus2_11+Fungus2_12+Fungus2_13+Fungus2_14+Fungus2_15+Fungus2_15_boss+Fungus2_15_boss_defeated+Fungus2_31diff --git a/games/hollowknight/tools/text.py b/games/hollowknight/tools/text.pyindex e24ebb9b..39dc460e 100644--- a/games/hollowknight/tools/text.py+++ b/games/hollowknight/tools/text.py@@ -125,6 +125,8 @@ FALLBACKS = {"MSG_S": "MSG", "MSG_XS": "MSG"}MSGS = {"FIREBALL": ("INV_NAME_SPELL_FIREBALL1", "GET_ITEM_INTRO2", "BUTTON_DESC_TAP", "GET_FIREBALL_1", "GET_FIREBALL_2","alpha"),"DASH": ("INV_NAME_DASH", "GET_ITEM_INTRO1", "BUTTON_DESC_PRESS", "GET_DASH_1", "GET_DASH_2", "shift")}+if os.environ.get("HK_PART") == "2": # (the Mantis Claw, in the second part)+ MSGS["WALLJUMP"] = ("INV_NAME_WALLJUMP", "GET_ITEM_INTRO1", "BUTTON_DESC_PRESS", "GET_WALLJUMP_1", "GET_WALLJUMP_2", "OK")# the titles the game shows (the Titles sheet's X_MAIN, X_SUB, X_SUPER): the areas', bosses' and characters'TITLES = ["KINGSPASS", "DIRTMOUTH", "CROSSROADS", "EGGTEMPLE", "SHAMANTEMPLE", "GREENPATH", "BIGFLY", "FALSE_KNIGHT",diff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.pyindex f4024111..e68f6bab 100644--- a/games/hollowknight/tools/vm.py+++ b/games/hollowknight/tools/vm.py@@ -61,6 +61,17 @@ ROOMS = {"Crossroads_33": ["_Props/full_wall_left", "Cornifer", "Cornifer Card"],"Fungus1_32": ["Breakable Wall", "Inspect Region"],"Crossroads_11_alt": ["Inspect Region"],+ # (Hollow Knight: Fungal Wastes) Quirrel at Queen's Station and over Mantis Village; Cornifer; the Mantis Claw; the+ # Mantis' levers and gates; the Shrumal Ogres' notch; what the Mantis Lords guard+ "Fungus2_01": ["Quirrel Station NPC"],+ "Fungus2_05": ["Battle Scene v2/Uncompleted/Shiny Item", "Battle Scene v2/Completed/Shiny Item"],+ "Fungus2_18": ["_NPCs/Cornifer", "Card & Mushroom/Cornifer Card", "Mantis Lever", "Mantis Gate", "_Props/Grub Bottle"],+ "Fungus2_14": ["Shiny Item Stand", "Quirrel Mantis NPC", "Mantis Lever", "Mantis Lever (1)", "Mantis Gate", "Mantis Gate F",+ "Mantis Floor Gate", "Inspect Region"],+ "Fungus2_12": ["Inspect Region"],+ "Fungus2_15": ["Mantis Lever", "Mantis Lever (1)", "Mantis Lever (2)", "Mantis Lever (3)", "Mantis Lever (4)", "Mantis Gate",+ "Mantis Gate (1)", "Mantis Gate (2)", "Mantis Gate (3)", "Mantis Gate (4)", "Breakable Wall", "mantis_cage_up"],+ "Fungus2_31": ["Mantis Chest/Item/Shiny Item Charm", "Mantis Chest (1)/Item/Shiny Item", "Lords Undefeated Group"],}def _piece(doc, q, rigid=True):"""A piece of debris (a sprite with a Rigidbody2D: how it falls, bounces and spins) -> FlingPiece's operands."""@@ -143,9 +154,32 @@ def _behaviours(rm, o):"animationTriggerEvent": None,"animationCompleteEvent": ["event", "FINISHED"]})],{"FINISHED": "Idle"})])})+ import ents+ pdf = ents.pd_flags()+ for bn, off_if in _conds(o, pdf)[2:]:+ # (a DeactivateIfPlayerdata past the two its record keeps: a script that turns it off as it starts)+ out.append({"fsm": _fsm("Deactivate If", "Init", {}, [+ ("Init", [("PlayerDataBoolTest", {"gameObject": "$GameManager", "boolName": bn,+ "isTrue": ["event", "OFF"] if off_if else None,+ "isFalse": None if off_if else ["event", "OFF"]})], {"OFF": "Off"}),+ ("Off", [("ActivateGameObject", {"gameObject": "Owner", "activate": False, "recursive": False,+ "resetOnExit": False, "everyFrame": False})], {})])})return out+# (places past the parts of Hallownest there are: an object's conditions on them last, in a script if need be)+FAR_CONDS = {"visitedRuins", "visitedDeepnest"}+++def _conds(o, pdf):+ """its DeactivateIfPlayerdata conditions this game knows: [(bool, off if true)], those on places further in last"""+ out = []+ for bn, off_if in state.conditions(o):+ if bn in pdf and (bn, off_if) not in out:+ out.append((bn, off_if))+ return sorted(out, key=lambda c: c[0] in FAR_CONDS)++# FSMs left out (what this port does not have: the dream nail, sounds...)SKIP_FSMS = {"npc_dream_dialogue", "Dream Dialogue", "Rotate", "Shop Open Voice", "Enviro Region", "tink_effect","RespawnTriggerFSM"}@@ -204,7 +238,7 @@ O_NONE = 0xFFFFPD_INTS = ["MPCharge", "health", "maxHealth", "geo", "fireballLevel", "quakeLevel", "screamLevel", "shaman", "elderbug","permadeathMode", "nailDamage", "hornetGreenpath", "quirrelEggTemple", "charmsOwned", "trinket1", "trinket2","trinket3", "trinket4", "rancidEggs", "ore", "grubsCollected", "grubRewards", "stagPosition", "stationsOpened",- "xunFlowerBrokeTimes", "menderState"]+ "xunFlowerBrokeTimes", "menderState", "charmSlots"]# PlayerData bools kept elsewhere (src/vm.c)PD_SPECIAL = {"disablePause": 0xFFF0, "hasSpell": 0xFFF1, "canDash": 0xFFF2}# PlayerData bools that keep their new game value all through this part of the game@@ -451,7 +485,7 @@ HERO_METHODS = ["RelinquishControl", "RegainControl", "StopAnimationControl", "S"FindGroundPoint", "SetBenchRespawn", "SetHazardRespawn", "RelinquishControlNotVelocity","SetCState", "SaveGame", "AffectedByGravity", "ResetHardLandingTimer", "StopPlayingAudio", "CanInspect","CanInput", "GetState", "CancelHeroJump", "ForceHardLanding", "AddHealth", "TryAddMPChargeSpa", "RecoilLeft",- "RecoilRight"]+ "RecoilRight", "CharmUpdate", "RefreshOvercharm"]# (GetState's states, by name: its argument)HERO_STATES = ["onGround", "attacking", "upAttacking", "downAttacking", "dashing", "backDashing", "willHardLand","spellQuake"] # (backDashing, spellQuake: never here)@@ -473,14 +507,18 @@ NOTICE_PREFABS = {("resources.assets", 4251): "relic", ("sharedassets6.assets",# numbers them (pack.py makes the sprites)NOTICE_ICONS = []# the charms this part of the game has (their icons and names: msg.c, the inventory)-CHARMS = [1, 2, 3, 4, 6, 7, 8, 14, 18, 19, 20]+CHARMS = [1, 2, 3, 4, 6, 7, 8, 13, 14, 18, 19, 20] # (Mark of Pride: in the second part, worn in both)# the game's objects the scripts find by name that are not theirs (enemies): what they are to themGAME_OBJECTS = {"Hornet Boss 1": 0xFF0C, "Prompt Blanker": 0xFF11} # (the HUD's Prompt Blanker: msg.c's)O_CHARM_TUTE = 0xFF0E # (src/vm.c)# what a trigger's Trigger2dEvent hears, by collideTag: the Knight (any), a spellTRIGGER_TAGS = {None: 0, "": 0, "Player": 0, "Untagged": 0, "Hero Spell": 1, "Nail Attack": 2}+# objects the game's own code turns on by name (vm_set_active), named apart from the others of their name: an arena's+# item (Battle Control's Drop Item), and the one there once its fight is over (Activate)+VM_NAMES = {("Fungus2_05", "Battle Scene v2/Uncompleted/Shiny Item"): "Arena Item",+ ("Fungus2_05", "Battle Scene v2/Completed/Shiny Item"): "Arena Item Kept"}# the items the message shows (text.MSGS's order), by Msg Control's Item-MSG_ITEMS = {"Fireball": 0, "Dash": 1}+MSG_ITEMS = {"Fireball": 0, "Dash": 1, "Walljump": 2}# camera shake eventsSHAKES = {"EnemyKillShake": 1, "AverageShake": 2, "BigShake": 3, "SmallShake": 4}@@ -1801,8 +1839,7 @@ def room_blob(name, clip_index, sprites, owners=(), persist=None):# (its own size, drawn at its scale: its texture as fine as it is drawn)sprite = sprites.id(o.get("_doc") or rm.d, sr["m_Sprite"], 1.0, max(abs(sx), abs(sy)), world=True)# (DeactivateIfPlayerdataTrue, False: two at most)- conds = [pdf[bn] | (0x8000 if off_if else 0) for bn, off_if in state.conditions(o) if bn in pdf]- conds = sorted(set(conds), key=conds.index)+ conds = [pdf[bn] | (0x8000 if off_if else 0) for bn, off_if in _conds(o, pdf)][:2] # (more: _behaviours')if o.get("_variant"):# (a scene loaded with the room's by a PlayerData bool: there only when it has that value)bn, val = o["_variant"]@@ -1829,7 +1866,8 @@ def room_blob(name, clip_index, sprites, owners=(), persist=None):col = (mr or {}).get("m_Color") or {"r": 1, "g": 1, "b": 1, "a": 1}rgba = [max(0, min(255, int(round(col[k] * 255)))) for k in "rgba"]objs += struct.pack(OBJ, o["pos"][0], o["pos"][1], o["pos"][2], sx, sy, bx, by, bhx, bhy, parent,- STR.id(o["name"]), sprite, first, start, min(count, 255), fl, cond, layer, order, blend,+ STR.id(VM_NAMES.get((name, o["path"]), o["name"])), sprite, first, start, min(count, 255), fl,+ cond, layer, order, blend,cols[0] if cols else 0, len(cols), *rgba, cond2)fsms = bytearray()for di, owner, init, fname in rm.fsms: