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: charm effects
Mason Chen2821d42e7830
diff --git a/games/hollowknight/src/anim.c b/games/hollowknight/src/anim.cindex 5649d57b..3cd02d09 100644--- a/games/hollowknight/src/anim.c+++ b/games/hollowknight/src/anim.c@@ -33,6 +33,7 @@ float clip_duration(int clip) {return c->n / c->fps;}int clip_frames_count(int clip) { return clip_rec(clip)->n; }+int clip_frame_sprite(int clip, int frame) { return clip_frames(clip_rec(clip))[frame] & 0x7FFF; }static uint32_t rng = 0x9E3779B9u;static int rand_below(int n) {diff --git a/games/hollowknight/src/data.bin b/games/hollowknight/src/data.binindex 51470264..79783bc5 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 eea6b90d..4dba4a8b 100644--- a/games/hollowknight/src/data.h+++ b/games/hollowknight/src/data.h@@ -77,497 +77,502 @@#define CLIP_KNIGHT_DEATH_HEAD_NORMAL 17#define CLIP_KNIGHT_DOWNSLASH 18#define CLIP_KNIGHT_DOWNSLASHEFFECT 19-#define CLIP_KNIGHT_DREAMER_LAND 20-#define CLIP_KNIGHT_ENTER 21-#define CLIP_KNIGHT_EXIT 22-#define CLIP_KNIGHT_EXIT_DOOR_TO_IDLE 23-#define CLIP_KNIGHT_FALL 24-#define CLIP_KNIGHT_FIREBALL_ANTIC 25-#define CLIP_KNIGHT_FIREBALL1_CAST 26-#define CLIP_KNIGHT_FOCUS 27-#define CLIP_KNIGHT_FOCUS_END 28-#define CLIP_KNIGHT_FOCUS_GET 29-#define CLIP_KNIGHT_FOCUS_GET_ONCE 30-#define CLIP_KNIGHT_GET_OFF 31-#define CLIP_KNIGHT_GETUPTOIDLE 32-#define CLIP_KNIGHT_HARDLAND 33-#define CLIP_KNIGHT_HAZARD_RESPAWN 34-#define CLIP_KNIGHT_IDLE 35-#define CLIP_KNIGHT_IDLE_HURT 36-#define CLIP_KNIGHT_IDLE_WIND 37-#define CLIP_KNIGHT_LAND 38-#define CLIP_KNIGHT_LOOKDOWN 39-#define CLIP_KNIGHT_LOOKDOWNEND 40-#define CLIP_KNIGHT_LOOKDOWNTOIDLE 41-#define CLIP_KNIGHT_LOOKUP 42-#define CLIP_KNIGHT_LOOKUPEND 43-#define CLIP_KNIGHT_LOOKUPTOIDLE 44-#define CLIP_KNIGHT_MAP_AWAY 45-#define CLIP_KNIGHT_MAP_IDLE 46-#define CLIP_KNIGHT_MAP_OPEN 47-#define CLIP_KNIGHT_MAP_TURN 48-#define CLIP_KNIGHT_MAP_UPDATE 49-#define CLIP_KNIGHT_MAP_WALK 50-#define CLIP_KNIGHT_PROSTRATE 51-#define CLIP_KNIGHT_PROSTRATE_RISE 52-#define CLIP_KNIGHT_RECOIL 53-#define CLIP_KNIGHT_RESPAWN_WAKE 54-#define CLIP_KNIGHT_ROAR_LOCK 55-#define CLIP_KNIGHT_RUN 56-#define CLIP_KNIGHT_RUN_TO_IDLE 57-#define CLIP_KNIGHT_SIT 58-#define CLIP_KNIGHT_SIT_FALL_ASLEEP 59-#define CLIP_KNIGHT_SIT_IDLE 60-#define CLIP_KNIGHT_SIT_LEAN 61-#define CLIP_KNIGHT_SIT_MAP_CLOSE 62-#define CLIP_KNIGHT_SIT_MAP_OPEN 63-#define CLIP_KNIGHT_SITTING_ASLEEP 64-#define CLIP_KNIGHT_SLASH 65-#define CLIP_KNIGHT_SLASHALT 66-#define CLIP_KNIGHT_SLASHEFFECT 67-#define CLIP_KNIGHT_SLASHEFFECTALT 68-#define CLIP_KNIGHT_SPIKE_DEATH 69-#define CLIP_KNIGHT_SPIKE_DEATH_ANTIC 70-#define CLIP_KNIGHT_STUN 71-#define CLIP_KNIGHT_TURN 72-#define CLIP_KNIGHT_TURNFROMBG 73-#define CLIP_KNIGHT_TURNTOBG 74-#define CLIP_KNIGHT_TURNTOIDLE 75-#define CLIP_KNIGHT_UPSLASH 76-#define CLIP_KNIGHT_UPSLASHEFFECT 77-#define CLIP_KNIGHT_WAKE 78-#define CLIP_KNIGHT_WAKE_TO_SIT 79-#define CLIP_KNIGHT_WAKE_UP_GROUND 80-#define CLIP_KNIGHT_WALK 81-#define CLIP_GEOROCK_IDLE_1 82-#define CLIP_GEOROCK_GLEAM_1 83-#define CLIP_GEOROCK_BROKEN_1 84-#define CLIP_GEOROCK_IDLE_2 85-#define CLIP_GEOROCK_GLEAM_2 86-#define CLIP_GEOROCK_BROKEN_2 87-#define CLIP_CHEST_IDLE 88-#define CLIP_CHEST_OPEN 89-#define CLIP_CHEST_BURST 90-#define CLIP_CHEST_OPENED 91-#define CLIP_HUD_HEALTH_EMPTY 92-#define CLIP_HUD_HEALTH_IDLE 93-#define CLIP_HUD_HEALTH_BREAK 94-#define CLIP_HUD_HEALTH_REFILL 95-#define CLIP_HUD_HEALTH_APPEAR 96-#define CLIP_HUD_BLUE_APPEAR 97-#define CLIP_HUD_BLUE_IDLE 98-#define CLIP_HUD_BLUE_BREAK 99-#define CLIP_HUD_BLUE_BREAK_FAST 100-#define CLIP_HUD_HUD_FRAME 101-#define CLIP_HUD_HUD_FRAME_IDLE 102-#define CLIP_HUD_HUD_FRAME_CRACKAPPEAR 103-#define CLIP_HUD_HUD_FRAME_CRACKED 104-#define CLIP_HUD_COIN_APPEAR 105-#define CLIP_HUD_COIN_IDLE 106-#define CLIP_HUD_COIN_GET 107-#define CLIP_HUD_SOUL_BURST 108-#define CLIP_LIQUID_FILL 109-#define CLIP_LIQUID_IDLE 110-#define CLIP_LIQUID_SHRINK 111-#define CLIP_LIQUID_DRAIN 112-#define CLIP_GEO_SMALL_IDLE 113-#define CLIP_GEO_SMALL_AIR 114-#define CLIP_GEO_MED_IDLE 115-#define CLIP_GEO_MED_AIR 116-#define CLIP_GEO_LARGE_IDLE 117-#define CLIP_GEO_LARGE_AIR 118-#define CLIP_DIALOGUE_ARROW_UP 119-#define CLIP_DIALOGUE_ARROW_DOWN 120-#define CLIP_DIALOGUE_STOP_UP 121-#define CLIP_DIALOGUE_STOP_DOWN 122-#define CLIP_DIALOGUE_FLEUR_TOP_UP 123-#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 124-#define CLIP_DIALOGUE_FLEUR_BOT_UP 125-#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 126-#define CLIP_DIALOGUE_DREAM_UP 127-#define CLIP_DIALOGUE_DREAM_DOWN 128-#define CLIP_PROMPT_BLANK 129-#define CLIP_PROMPT_DOWN 130-#define CLIP_PROMPT_ENTER_DOWN 131-#define CLIP_PROMPT_ENTER_IDLE 132-#define CLIP_PROMPT_ENTER_UP 133-#define CLIP_PROMPT_IDLE 134-#define CLIP_PROMPT_LISTEN_DOWN 135-#define CLIP_PROMPT_LISTEN_IDLE 136-#define CLIP_PROMPT_LISTEN_UP 137-#define CLIP_PROMPT_UP 138-#define CLIP_SHADE_APPEAR 139-#define CLIP_SHADE_CAST 140-#define CLIP_SHADE_CAST_ANTIC 141-#define CLIP_SHADE_CAST_CHARGE 142-#define CLIP_SHADE_CAST_RING 143-#define CLIP_SHADE_DEATH 144-#define CLIP_SHADE_DEATH_GLOW 145-#define CLIP_SHADE_DEATH_START 146-#define CLIP_SHADE_DEPART 147-#define CLIP_SHADE_FIREBALL 148-#define CLIP_SHADE_FIREBALL_END 149-#define CLIP_SHADE_FLY 150-#define CLIP_SHADE_IDLE 151-#define CLIP_SHADE_RETREAT_END 152-#define CLIP_SHADE_RETREAT_START 153-#define CLIP_SHADE_SLASH 154-#define CLIP_SHADE_SLASH_ANTIC 155-#define CLIP_SHADE_SLASH_CD 156-#define CLIP_SHADE_SLASH_EFFECT 157-#define CLIP_SHADE_STARTLE 158-#define CLIP_SHADE_TURNTOFLY 159-#define CLIP_SHADE_TURNTOIDLE 160-#define CLIP_CRAWLER_WALK 161-#define CLIP_CRAWLER_TURN 162-#define CLIP_CRAWLER_IDLE 163-#define CLIP_CRAWLER_DEATH_AIR 164-#define CLIP_CRAWLER_DEATH_LAND 165-#define CLIP_BUZZER_CHASE 166-#define CLIP_BUZZER_IDLE 167-#define CLIP_BUZZER_STARTLE 168-#define CLIP_BUZZER_DEATH_AIR 169-#define CLIP_BUZZER_DEATH_LAND 170-#define CLIP_BUZZER_FLY 171-#define CLIP_BUZZER_TURNTOFLY 172-#define CLIP_BUZZER_TURNTOIDLE 173-#define CLIP_TIKTIK_DEATH_AIR 174-#define CLIP_TIKTIK_DEATH_LAND 175-#define CLIP_TIKTIK_STUN 176-#define CLIP_TIKTIK_WALK 177-#define CLIP_GRUZZER_DEATH_AIR 178-#define CLIP_GRUZZER_DEATH_LAND 179-#define CLIP_GRUZZER_FLY 180-#define CLIP_ASPID_DEATH_AIR 181-#define CLIP_ASPID_FIRE_LONG 182-#define CLIP_ASPID_FLY 183-#define CLIP_ASPID_TURNTOFLY 184-#define CLIP_BALDUR_DEATH_AIR 185-#define CLIP_BALDUR_DEATH_LAND 186-#define CLIP_BALDUR_IDLE 187-#define CLIP_BALDUR_ROLL 188-#define CLIP_BALDUR_START 189-#define CLIP_BALDUR_STOP 190-#define CLIP_ELDERBALDUR_CLOSE1 191-#define CLIP_ELDERBALDUR_CLOSE2 192-#define CLIP_ELDERBALDUR_CLOSED 193-#define CLIP_ELDERBALDUR_DEATH 194-#define CLIP_ELDERBALDUR_DEATH_STUN 195-#define CLIP_ELDERBALDUR_HIT 196-#define CLIP_ELDERBALDUR_IDLE 197-#define CLIP_ELDERBALDUR_OPEN 198-#define CLIP_ELDERBALDUR_SHOOT_ANTIC 199-#define CLIP_ELDERBALDUR_SHOOT_CD 200-#define CLIP_HUSK_ATTACK_ANTICIPATE 201-#define CLIP_HUSK_ATTACK_COOLDOWN 202-#define CLIP_HUSK_ATTACK_LUNGE 203-#define CLIP_HUSK_DEATH_AIR 204-#define CLIP_HUSK_DEATH_LAND 205-#define CLIP_HUSK_IDLE 206-#define CLIP_HUSK_TURN 207-#define CLIP_HUSK_WALK 208-#define CLIP_BARGER_ATTACK_ANTICIPATE 209-#define CLIP_BARGER_ATTACK_COOLDOWN 210-#define CLIP_BARGER_ATTACK_LUNGE 211-#define CLIP_BARGER_DEATH_AIR 212-#define CLIP_BARGER_DEATH_LAND 213-#define CLIP_BARGER_IDLE 214-#define CLIP_BARGER_TURN 215-#define CLIP_BARGER_WALK 216-#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 217-#define CLIP_HORNHEAD_ATTACK_COOLDOWN 218-#define CLIP_HORNHEAD_ATTACK_LUNGE 219-#define CLIP_HORNHEAD_DEATH_AIR 220-#define CLIP_HORNHEAD_DEATH_LAND 221-#define CLIP_HORNHEAD_IDLE 222-#define CLIP_HORNHEAD_TURN 223-#define CLIP_HORNHEAD_WALK 224-#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 225-#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 226-#define CLIP_MOSSRUNNER_ATTACK_LUNGE 227-#define CLIP_MOSSRUNNER_DEATH_AIR 228-#define CLIP_MOSSRUNNER_DEATH_LAND 229-#define CLIP_MOSSRUNNER_IDLE 230-#define CLIP_MOSSRUNNER_TURN 231-#define CLIP_MOSSRUNNER_WALK 232-#define CLIP_LEAPER_ATTACK 233-#define CLIP_LEAPER_DEATH_AIR 234-#define CLIP_LEAPER_DEATH_LAND 235-#define CLIP_LEAPER_IDLE 236-#define CLIP_LEAPER_LAND 237-#define CLIP_LEAPER_TURN 238-#define CLIP_LEAPER_WALK 239-#define CLIP_GUARD_ANTICIPATE 240-#define CLIP_GUARD_ATTACK2 241-#define CLIP_GUARD_DEATH_AIR 242-#define CLIP_GUARD_DEATH_LAND 243-#define CLIP_GUARD_DORMANT 244-#define CLIP_GUARD_IDLE 245-#define CLIP_GUARD_RUN 246-#define CLIP_GUARD_STARTLE 247-#define CLIP_GUARD_STOMP_ANTIC 248-#define CLIP_GUARD_STOMP_JUMP 249-#define CLIP_GUARD_STOMP_LAND 250-#define CLIP_GUARD_STOP_RUN 251-#define CLIP_GUARD_STOP_WALK 252-#define CLIP_GUARD_SWIPE 253-#define CLIP_GUARD_TURN 254-#define CLIP_GUARD_WAKE 255-#define CLIP_GUARD_WALK 256-#define CLIP_FK_ATTACK 257-#define CLIP_FK_ATTACK_ANTIC 258-#define CLIP_FK_ATTACK_RECOVER 259-#define CLIP_FK_BLANK 260-#define CLIP_FK_BODY 261-#define CLIP_FK_DEATH_FALL 262-#define CLIP_FK_DEATH_HEAD_1 263-#define CLIP_FK_DEATH_HEAD_2 264-#define CLIP_FK_DEATH_LAND 265-#define CLIP_FK_DEATH_SPAZ 266-#define CLIP_FK_IDLE 267-#define CLIP_FK_JUMP 268-#define CLIP_FK_JUMP_ANTIC 269-#define CLIP_FK_JUMP_ATTACK_HIT_1 270-#define CLIP_FK_JUMP_ATTACK_HIT_2 271-#define CLIP_FK_JUMP_ATTACK_HIT_3 272-#define CLIP_FK_JUMP_ATTACK_UP 273-#define CLIP_FK_LAND 274-#define CLIP_FK_RAGE 275-#define CLIP_FK_RUN 276-#define CLIP_FK_RUN_ANTIC 277-#define CLIP_FK_STUN_HIT 278-#define CLIP_FK_STUN_OPEN 279-#define CLIP_FK_STUN_OPENED 280-#define CLIP_FK_STUN_RECOVER 281-#define CLIP_FK_STUN_ROLL 282-#define CLIP_FK_STUN_ROLL_END 283-#define CLIP_FK_TURN 284-#define CLIP_FKHEAD_DEATH_LAND 285-#define CLIP_FKHEAD_HEAD_HIT 286-#define CLIP_FKHEAD_HEAD_IDLE 287-#define CLIP_FKHEAD_HEAD_SPAZ 288-#define CLIP_HATCHER_DEATH_AIR 289-#define CLIP_HATCHER_DEATH_LAND 290-#define CLIP_HATCHER_FIRE 291-#define CLIP_HATCHER_FLY 292-#define CLIP_HATCHLING_FLY 293-#define CLIP_SLUG_BOUNCE 294-#define CLIP_SLUG_DEATH_AIR 295-#define CLIP_SLUG_DEATH_LAND 296-#define CLIP_SLUG_IDLE_TODOWN 297-#define CLIP_SLUG_IDLE_TOUP 298-#define CLIP_SLUG_IDLE_UP 299-#define CLIP_SLUG_RUN 300-#define CLIP_SLUG_STARTLE 301-#define CLIP_GFLY_BURST 302-#define CLIP_GFLY_CHARGE 303-#define CLIP_GFLY_CHARGE_ANTIC 304-#define CLIP_GFLY_CHARGE_RECOVER 305-#define CLIP_GFLY_DEATH 306-#define CLIP_GFLY_FALL 307-#define CLIP_GFLY_FLY 308-#define CLIP_GFLY_GURGLE_LOOP 309-#define CLIP_GFLY_GURGLE_ONCE 310-#define CLIP_GFLY_SLAM_DOWN 311-#define CLIP_GFLY_SLAM_END 312-#define CLIP_GFLY_SLAM_UP 313-#define CLIP_GFLY_SLEEP 314-#define CLIP_GFLY_STOP 315-#define CLIP_GFLY_WAKE 316-#define CLIP_GFLY_WIGGLE 317-#define CLIP_MOSSWALKER_APPEAR 318-#define CLIP_MOSSWALKER_BURY 319-#define CLIP_MOSSWALKER_DEATH_AIR 320-#define CLIP_MOSSWALKER_DEATH_LAND 321-#define CLIP_MOSSWALKER_SHAKE 322-#define CLIP_MOSSWALKER_TURN 323-#define CLIP_MOSSWALKER_WALK 324-#define CLIP_PIGEON_FLY 325-#define CLIP_PIGEON_IDLE_01 326-#define CLIP_PIGEON_IDLE_02 327-#define CLIP_PIGEON_IDLE_03 328-#define CLIP_PLANTTRAP_DEATH 329-#define CLIP_PLANTTRAP_IDLE 330-#define CLIP_PLANTTRAP_RETRACT 331-#define CLIP_PLANTTRAP_SNAP 332-#define CLIP_PLANTTRAP_SNAP_READY 333-#define CLIP_SHAKER_ATTACK 334-#define CLIP_SHAKER_DEATH_AIR 335-#define CLIP_SHAKER_DEATH_LAND 336-#define CLIP_SHAKER_IDLE 337-#define CLIP_SHAKER_TURN 338-#define CLIP_SHAKER_WALK 339-#define CLIP_MOSQUITO_ATTACK 340-#define CLIP_MOSQUITO_ATTACK_ANTIC 341-#define CLIP_MOSQUITO_DEATH_AIR 342-#define CLIP_MOSQUITO_DEATH_LAND 343-#define CLIP_MOSQUITO_IDLE 344-#define CLIP_MOSQUITO_STARTLE 345-#define CLIP_MOSQUITO_TURNTOIDLE 346-#define CLIP_FATFLY_ATTACK 347-#define CLIP_FATFLY_DEATH_AIR 348-#define CLIP_FATFLY_DEATH_LAND 349-#define CLIP_FATFLY_FLY 350-#define CLIP_MOSSCHARGER_APPEAR 351-#define CLIP_MOSSCHARGER_CHARGE 352-#define CLIP_MOSSCHARGER_DEATH_AIR 353-#define CLIP_MOSSCHARGER_DEATH_LAND 354-#define CLIP_MOSSCHARGER_DISAPPEAR 355-#define CLIP_MOSSCHARGER_ESCAPE 356-#define CLIP_MOSSCHARGER_GET_UP 357-#define CLIP_MOSSCHARGER_STUN 358-#define CLIP_MOSSCHARGER_TURNRUN 359-#define CLIP_MOSSKNIGHT_DEATH_AIR 360-#define CLIP_MOSSKNIGHT_DEATH_LAND 361-#define CLIP_MOSSKNIGHT_DORMANT_1 362-#define CLIP_MOSSKNIGHT_DORMANT_2 363-#define CLIP_MOSSKNIGHT_EVADE 364-#define CLIP_MOSSKNIGHT_IDLE 365-#define CLIP_MOSSKNIGHT_SHAKE 366-#define CLIP_MOSSKNIGHT_SHIELD_FRONT 367-#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 368-#define CLIP_MOSSKNIGHT_SHIELD_TOP 369-#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 370-#define CLIP_MOSSKNIGHT_SHOOT 371-#define CLIP_MOSSKNIGHT_SHOOT_END 372-#define CLIP_MOSSKNIGHT_SLASH 373-#define CLIP_MOSSKNIGHT_SLASH_2 374-#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 375-#define CLIP_MOSSKNIGHT_SLASH_EFFECT 376-#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 377-#define CLIP_MOSSKNIGHT_SLASH_END 378-#define CLIP_MOSSKNIGHT_SLASH_QUICK 379-#define CLIP_MOSSKNIGHT_TURN 380-#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 381-#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 382-#define CLIP_MOSSKNIGHT_WAKE 383-#define CLIP_MOSSKNIGHT_WALK 384-#define CLIP_HORNET_A_DASH 385-#define CLIP_HORNET_A_DASH_ANTIC 386-#define CLIP_HORNET_AIR_DASH_EFFECT 387-#define CLIP_HORNET_DEATH_AIR 388-#define CLIP_HORNET_EVADE 389-#define CLIP_HORNET_EVADE_ANTIC 390-#define CLIP_HORNET_FALL 391-#define CLIP_HORNET_FLASH 392-#define CLIP_HORNET_FLOURISH 393-#define CLIP_HORNET_G_DASH 394-#define CLIP_HORNET_G_DASH_ANTIC 395-#define CLIP_HORNET_G_DASH_EFFECT 396-#define CLIP_HORNET_G_DASH_RECOVER1 397-#define CLIP_HORNET_G_DASH_RECOVER2 398-#define CLIP_HORNET_HARD_LAND 399-#define CLIP_HORNET_IDLE 400-#define CLIP_HORNET_JUMP 401-#define CLIP_HORNET_JUMP_ANTIC 402-#define CLIP_HORNET_LAND 403-#define CLIP_HORNET_NEEDLE 404-#define CLIP_HORNET_NEEDLE_THREAD 405-#define CLIP_HORNET_RUN 406-#define CLIP_HORNET_SPHERE_ANTIC_A 407-#define CLIP_HORNET_SPHERE_ANTIC_G 408-#define CLIP_HORNET_SPHERE_ATTACK 409-#define CLIP_HORNET_SPHERE_BALL 410-#define CLIP_HORNET_SPHERE_RECOVER_A 411-#define CLIP_HORNET_SPHERE_RECOVER_G 412-#define CLIP_HORNET_STUN 413-#define CLIP_HORNET_STUN_AIR 414-#define CLIP_HORNET_THROW 415-#define CLIP_HORNET_THROW_ANTIC 416-#define CLIP_HORNET_THROW_EFFECT 417-#define CLIP_HORNET_THROW_RECOVER 418-#define CLIP_HORNET_WALL_IMPACT 419-#define CLIP_HORNET_WOUNDED 420-#define CLIP_BGATE_BG_OPENED 421-#define CLIP_BGATE_BG_CLOSE_1 422-#define CLIP_BGATE_BG_CLOSE_2 423-#define CLIP_BGATE_BG_OPEN 424-#define CLIP_BGATE_BG_CLOSED 425-#define CLIP_BGATE_BONE_GATE_OPENED 426-#define CLIP_BGATE_BONE_GATE_CLOSE 427-#define CLIP_BGATE_BONE_GATE_CLOSED 428-#define CLIP_BGATE_BONE_GATE_OPEN 429-#define CLIP_COCOON_COCOON_IDLE 430-#define CLIP_COCOON_COCOON_SWEAT 431-#define CLIP_COCOON_SCUTTLER_LAND 432-#define CLIP_COCOON_SCUTTLER_RUN 433-#define CLIP_FX_SPLAT 434-#define CLIP_FX_SPLAT2 435-#define CLIP_FIREBALL_BLAST 436-#define CLIP_FIREBALL_BALL 437-#define CLIP_FIREBALL_BALL_END 438-#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 439-#define CLIP_DRIP_IDLE 440-#define CLIP_DRIP_DRIP 441-#define CLIP_DRIP_FALL 442-#define CLIP_DRIP_IMPACT 443-#define CLIP_HORNETCS_EVADE 444-#define CLIP_HORNETCS_EVADE_ANTIC 445-#define CLIP_HORNETCS_FALL 446-#define CLIP_HORNETCS_HARPOON_SIDE 447-#define CLIP_HORNETCS_IDLE 448-#define CLIP_HORNETCS_JUMP_FULL 449-#define CLIP_HORNETCS_POINT 450-#define CLIP_HORNETCS_RUN 451-#define CLIP_HORNETCS_SOFT_LAND 452-#define CLIP_HORNETCS_THREAD_1 453-#define CLIP_HORNETCS_THROW_SIDE 454-#define CLIP_HORNETCS_THROW_SIDE_START 455-#define CLIP_HORNETCS_TURN 456-#define CLIP_HORNETCS_TURNTOIDLE 457-#define CLIP_BULLET_IDLE 458-#define CLIP_BULLET_IMPACT 459-#define CLIP_BULLET_SHOCKWAVE_SPURT 460-#define CLIP_PROP0_WATERFALL_LOOP 461-#define CLIP_PROP1_TORCH2 462-#define CLIP_PROP1_TORCH3 463-#define CLIP_VM0_FLOWER 464-#define CLIP_VM0_IDLE 465-#define CLIP_VM0_REACH 466-#define CLIP_VM0_REACH_TO_IDLE 467-#define CLIP_VM0_TALK_LEFT 468-#define CLIP_VM0_TALK_RIGHT 469-#define CLIP_VM0_TURN_LEFT 470-#define CLIP_VM0_TURN_RIGHT 471-#define CLIP_VM2_IDLE 472-#define CLIP_VM2_LOOKLEFT 473-#define CLIP_VM2_LOOKRIGHT 474-#define CLIP_VM3_IDLE 475-#define CLIP_VM3_TALK 476-#define CLIP_VM3_TALK_END 477-#define CLIP_VM4_IDLE 478-#define CLIP_VM4_LOOKLEFT 479-#define CLIP_VM4_LOOKRIGHT 480-#define CLIP_VM4_SIT 481-#define CLIP_VM4_SIT_TALK 482-#define CLIP_VM4_SIT_TALK_END 483-#define CLIP_VM5_DAZED 484-#define CLIP_VM5_IDLE 485-#define CLIP_VM5_WAKE 486-#define CLIP_VM8_HEGEMOL_CAST 487-#define CLIP_VM8_HEGEMOL_IDLE 488-#define CLIP_VM8_LURIEN_CAST 489-#define CLIP_VM8_LURIEN_IDLE 490-#define CLIP_VM8_MONOMON_CAST 491-#define CLIP_VM8_MONOMON_IDLE 492-#define CLIP_VM9_IDLE 493-#define CLIP_VM9_SIT_IDLE 494-#define CLIP_VM9_SIT_TALK 495-#define CLIP_VM9_SIT_TALK_END 496-#define CLIP_VM9_SUMMON 497-#define CLIP_VM9_TALK 498-#define CLIP_VM9_TALK_END 499-#define CLIP_VM9_TURN 500-#define CLIP_ANIM0_DASH_CLOAK_CORPSE000 501-#define CLIP_ANIM1_GROUND_PLINK_0 502-#define CLIP_ANIM2_FIREBALL_COLLECT_ANIM 503-#define SPRITE_HERO_LIGHT 2231-#define SPRITE_DIALOGUE_BACKBOARD 2232-#define SPRITE_PROMPT_SHADOW 2233-#define SPRITE_CORPSE_NAIL 2234-#define SPRITE_FK_BARREL 2235-#define SPRITE_FK_STAFF 2236-#define SPRITE_DIGIT0 2524+#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_TURN 75+#define CLIP_KNIGHT_TURNFROMBG 76+#define CLIP_KNIGHT_TURNTOBG 77+#define CLIP_KNIGHT_TURNTOIDLE 78+#define CLIP_KNIGHT_UPSLASH 79+#define CLIP_KNIGHT_UPSLASHEFFECT 80+#define CLIP_KNIGHT_UPSLASHEFFECT_F 81+#define CLIP_KNIGHT_WAKE 82+#define CLIP_KNIGHT_WAKE_TO_SIT 83+#define CLIP_KNIGHT_WAKE_UP_GROUND 84+#define CLIP_KNIGHT_WALK 85+#define CLIP_GEOROCK_IDLE_1 86+#define CLIP_GEOROCK_GLEAM_1 87+#define CLIP_GEOROCK_BROKEN_1 88+#define CLIP_GEOROCK_IDLE_2 89+#define CLIP_GEOROCK_GLEAM_2 90+#define CLIP_GEOROCK_BROKEN_2 91+#define CLIP_CHEST_IDLE 92+#define CLIP_CHEST_OPEN 93+#define CLIP_CHEST_BURST 94+#define CLIP_CHEST_OPENED 95+#define CLIP_HUD_HEALTH_EMPTY 96+#define CLIP_HUD_HEALTH_IDLE 97+#define CLIP_HUD_HEALTH_BREAK 98+#define CLIP_HUD_HEALTH_REFILL 99+#define CLIP_HUD_HEALTH_APPEAR 100+#define CLIP_HUD_BLUE_APPEAR 101+#define CLIP_HUD_BLUE_IDLE 102+#define CLIP_HUD_BLUE_BREAK 103+#define CLIP_HUD_BLUE_BREAK_FAST 104+#define CLIP_HUD_HUD_FRAME 105+#define CLIP_HUD_HUD_FRAME_IDLE 106+#define CLIP_HUD_HUD_FRAME_CRACKAPPEAR 107+#define CLIP_HUD_HUD_FRAME_CRACKED 108+#define CLIP_HUD_COIN_APPEAR 109+#define CLIP_HUD_COIN_IDLE 110+#define CLIP_HUD_COIN_GET 111+#define CLIP_HUD_SOUL_BURST 112+#define CLIP_LIQUID_FILL 113+#define CLIP_LIQUID_IDLE 114+#define CLIP_LIQUID_SHRINK 115+#define CLIP_LIQUID_DRAIN 116+#define CLIP_GEO_SMALL_IDLE 117+#define CLIP_GEO_SMALL_AIR 118+#define CLIP_GEO_MED_IDLE 119+#define CLIP_GEO_MED_AIR 120+#define CLIP_GEO_LARGE_IDLE 121+#define CLIP_GEO_LARGE_AIR 122+#define CLIP_GEOBUG_LAMP_BUG_IDLE 123+#define CLIP_DIALOGUE_ARROW_UP 124+#define CLIP_DIALOGUE_ARROW_DOWN 125+#define CLIP_DIALOGUE_STOP_UP 126+#define CLIP_DIALOGUE_STOP_DOWN 127+#define CLIP_DIALOGUE_FLEUR_TOP_UP 128+#define CLIP_DIALOGUE_FLEUR_TOP_DOWN 129+#define CLIP_DIALOGUE_FLEUR_BOT_UP 130+#define CLIP_DIALOGUE_FLEUR_BOT_DOWN 131+#define CLIP_DIALOGUE_DREAM_UP 132+#define CLIP_DIALOGUE_DREAM_DOWN 133+#define CLIP_PROMPT_BLANK 134+#define CLIP_PROMPT_DOWN 135+#define CLIP_PROMPT_ENTER_DOWN 136+#define CLIP_PROMPT_ENTER_IDLE 137+#define CLIP_PROMPT_ENTER_UP 138+#define CLIP_PROMPT_IDLE 139+#define CLIP_PROMPT_LISTEN_DOWN 140+#define CLIP_PROMPT_LISTEN_IDLE 141+#define CLIP_PROMPT_LISTEN_UP 142+#define CLIP_PROMPT_UP 143+#define CLIP_SHADE_APPEAR 144+#define CLIP_SHADE_CAST 145+#define CLIP_SHADE_CAST_ANTIC 146+#define CLIP_SHADE_CAST_CHARGE 147+#define CLIP_SHADE_CAST_RING 148+#define CLIP_SHADE_DEATH 149+#define CLIP_SHADE_DEATH_GLOW 150+#define CLIP_SHADE_DEATH_START 151+#define CLIP_SHADE_DEPART 152+#define CLIP_SHADE_FIREBALL 153+#define CLIP_SHADE_FIREBALL_END 154+#define CLIP_SHADE_FLY 155+#define CLIP_SHADE_IDLE 156+#define CLIP_SHADE_RETREAT_END 157+#define CLIP_SHADE_RETREAT_START 158+#define CLIP_SHADE_SLASH 159+#define CLIP_SHADE_SLASH_ANTIC 160+#define CLIP_SHADE_SLASH_CD 161+#define CLIP_SHADE_SLASH_EFFECT 162+#define CLIP_SHADE_STARTLE 163+#define CLIP_SHADE_TURNTOFLY 164+#define CLIP_SHADE_TURNTOIDLE 165+#define CLIP_CRAWLER_WALK 166+#define CLIP_CRAWLER_TURN 167+#define CLIP_CRAWLER_IDLE 168+#define CLIP_CRAWLER_DEATH_AIR 169+#define CLIP_CRAWLER_DEATH_LAND 170+#define CLIP_BUZZER_CHASE 171+#define CLIP_BUZZER_IDLE 172+#define CLIP_BUZZER_STARTLE 173+#define CLIP_BUZZER_DEATH_AIR 174+#define CLIP_BUZZER_DEATH_LAND 175+#define CLIP_BUZZER_FLY 176+#define CLIP_BUZZER_TURNTOFLY 177+#define CLIP_BUZZER_TURNTOIDLE 178+#define CLIP_TIKTIK_DEATH_AIR 179+#define CLIP_TIKTIK_DEATH_LAND 180+#define CLIP_TIKTIK_STUN 181+#define CLIP_TIKTIK_WALK 182+#define CLIP_GRUZZER_DEATH_AIR 183+#define CLIP_GRUZZER_DEATH_LAND 184+#define CLIP_GRUZZER_FLY 185+#define CLIP_ASPID_DEATH_AIR 186+#define CLIP_ASPID_FIRE_LONG 187+#define CLIP_ASPID_FLY 188+#define CLIP_ASPID_TURNTOFLY 189+#define CLIP_BALDUR_DEATH_AIR 190+#define CLIP_BALDUR_DEATH_LAND 191+#define CLIP_BALDUR_IDLE 192+#define CLIP_BALDUR_ROLL 193+#define CLIP_BALDUR_START 194+#define CLIP_BALDUR_STOP 195+#define CLIP_ELDERBALDUR_CLOSE1 196+#define CLIP_ELDERBALDUR_CLOSE2 197+#define CLIP_ELDERBALDUR_CLOSED 198+#define CLIP_ELDERBALDUR_DEATH 199+#define CLIP_ELDERBALDUR_DEATH_STUN 200+#define CLIP_ELDERBALDUR_HIT 201+#define CLIP_ELDERBALDUR_IDLE 202+#define CLIP_ELDERBALDUR_OPEN 203+#define CLIP_ELDERBALDUR_SHOOT_ANTIC 204+#define CLIP_ELDERBALDUR_SHOOT_CD 205+#define CLIP_HUSK_ATTACK_ANTICIPATE 206+#define CLIP_HUSK_ATTACK_COOLDOWN 207+#define CLIP_HUSK_ATTACK_LUNGE 208+#define CLIP_HUSK_DEATH_AIR 209+#define CLIP_HUSK_DEATH_LAND 210+#define CLIP_HUSK_IDLE 211+#define CLIP_HUSK_TURN 212+#define CLIP_HUSK_WALK 213+#define CLIP_BARGER_ATTACK_ANTICIPATE 214+#define CLIP_BARGER_ATTACK_COOLDOWN 215+#define CLIP_BARGER_ATTACK_LUNGE 216+#define CLIP_BARGER_DEATH_AIR 217+#define CLIP_BARGER_DEATH_LAND 218+#define CLIP_BARGER_IDLE 219+#define CLIP_BARGER_TURN 220+#define CLIP_BARGER_WALK 221+#define CLIP_HORNHEAD_ATTACK_ANTICIPATE 222+#define CLIP_HORNHEAD_ATTACK_COOLDOWN 223+#define CLIP_HORNHEAD_ATTACK_LUNGE 224+#define CLIP_HORNHEAD_DEATH_AIR 225+#define CLIP_HORNHEAD_DEATH_LAND 226+#define CLIP_HORNHEAD_IDLE 227+#define CLIP_HORNHEAD_TURN 228+#define CLIP_HORNHEAD_WALK 229+#define CLIP_MOSSRUNNER_ATTACK_ANTICIPATE 230+#define CLIP_MOSSRUNNER_ATTACK_COOLDOWN 231+#define CLIP_MOSSRUNNER_ATTACK_LUNGE 232+#define CLIP_MOSSRUNNER_DEATH_AIR 233+#define CLIP_MOSSRUNNER_DEATH_LAND 234+#define CLIP_MOSSRUNNER_IDLE 235+#define CLIP_MOSSRUNNER_TURN 236+#define CLIP_MOSSRUNNER_WALK 237+#define CLIP_LEAPER_ATTACK 238+#define CLIP_LEAPER_DEATH_AIR 239+#define CLIP_LEAPER_DEATH_LAND 240+#define CLIP_LEAPER_IDLE 241+#define CLIP_LEAPER_LAND 242+#define CLIP_LEAPER_TURN 243+#define CLIP_LEAPER_WALK 244+#define CLIP_GUARD_ANTICIPATE 245+#define CLIP_GUARD_ATTACK2 246+#define CLIP_GUARD_DEATH_AIR 247+#define CLIP_GUARD_DEATH_LAND 248+#define CLIP_GUARD_DORMANT 249+#define CLIP_GUARD_IDLE 250+#define CLIP_GUARD_RUN 251+#define CLIP_GUARD_STARTLE 252+#define CLIP_GUARD_STOMP_ANTIC 253+#define CLIP_GUARD_STOMP_JUMP 254+#define CLIP_GUARD_STOMP_LAND 255+#define CLIP_GUARD_STOP_RUN 256+#define CLIP_GUARD_STOP_WALK 257+#define CLIP_GUARD_SWIPE 258+#define CLIP_GUARD_TURN 259+#define CLIP_GUARD_WAKE 260+#define CLIP_GUARD_WALK 261+#define CLIP_FK_ATTACK 262+#define CLIP_FK_ATTACK_ANTIC 263+#define CLIP_FK_ATTACK_RECOVER 264+#define CLIP_FK_BLANK 265+#define CLIP_FK_BODY 266+#define CLIP_FK_DEATH_FALL 267+#define CLIP_FK_DEATH_HEAD_1 268+#define CLIP_FK_DEATH_HEAD_2 269+#define CLIP_FK_DEATH_LAND 270+#define CLIP_FK_DEATH_SPAZ 271+#define CLIP_FK_IDLE 272+#define CLIP_FK_JUMP 273+#define CLIP_FK_JUMP_ANTIC 274+#define CLIP_FK_JUMP_ATTACK_HIT_1 275+#define CLIP_FK_JUMP_ATTACK_HIT_2 276+#define CLIP_FK_JUMP_ATTACK_HIT_3 277+#define CLIP_FK_JUMP_ATTACK_UP 278+#define CLIP_FK_LAND 279+#define CLIP_FK_RAGE 280+#define CLIP_FK_RUN 281+#define CLIP_FK_RUN_ANTIC 282+#define CLIP_FK_STUN_HIT 283+#define CLIP_FK_STUN_OPEN 284+#define CLIP_FK_STUN_OPENED 285+#define CLIP_FK_STUN_RECOVER 286+#define CLIP_FK_STUN_ROLL 287+#define CLIP_FK_STUN_ROLL_END 288+#define CLIP_FK_TURN 289+#define CLIP_FKHEAD_DEATH_LAND 290+#define CLIP_FKHEAD_HEAD_HIT 291+#define CLIP_FKHEAD_HEAD_IDLE 292+#define CLIP_FKHEAD_HEAD_SPAZ 293+#define CLIP_HATCHER_DEATH_AIR 294+#define CLIP_HATCHER_DEATH_LAND 295+#define CLIP_HATCHER_FIRE 296+#define CLIP_HATCHER_FLY 297+#define CLIP_HATCHLING_FLY 298+#define CLIP_SLUG_BOUNCE 299+#define CLIP_SLUG_DEATH_AIR 300+#define CLIP_SLUG_DEATH_LAND 301+#define CLIP_SLUG_IDLE_TODOWN 302+#define CLIP_SLUG_IDLE_TOUP 303+#define CLIP_SLUG_IDLE_UP 304+#define CLIP_SLUG_RUN 305+#define CLIP_SLUG_STARTLE 306+#define CLIP_GFLY_BURST 307+#define CLIP_GFLY_CHARGE 308+#define CLIP_GFLY_CHARGE_ANTIC 309+#define CLIP_GFLY_CHARGE_RECOVER 310+#define CLIP_GFLY_DEATH 311+#define CLIP_GFLY_FALL 312+#define CLIP_GFLY_FLY 313+#define CLIP_GFLY_GURGLE_LOOP 314+#define CLIP_GFLY_GURGLE_ONCE 315+#define CLIP_GFLY_SLAM_DOWN 316+#define CLIP_GFLY_SLAM_END 317+#define CLIP_GFLY_SLAM_UP 318+#define CLIP_GFLY_SLEEP 319+#define CLIP_GFLY_STOP 320+#define CLIP_GFLY_WAKE 321+#define CLIP_GFLY_WIGGLE 322+#define CLIP_MOSSWALKER_APPEAR 323+#define CLIP_MOSSWALKER_BURY 324+#define CLIP_MOSSWALKER_DEATH_AIR 325+#define CLIP_MOSSWALKER_DEATH_LAND 326+#define CLIP_MOSSWALKER_SHAKE 327+#define CLIP_MOSSWALKER_TURN 328+#define CLIP_MOSSWALKER_WALK 329+#define CLIP_PIGEON_FLY 330+#define CLIP_PIGEON_IDLE_01 331+#define CLIP_PIGEON_IDLE_02 332+#define CLIP_PIGEON_IDLE_03 333+#define CLIP_PLANTTRAP_DEATH 334+#define CLIP_PLANTTRAP_IDLE 335+#define CLIP_PLANTTRAP_RETRACT 336+#define CLIP_PLANTTRAP_SNAP 337+#define CLIP_PLANTTRAP_SNAP_READY 338+#define CLIP_SHAKER_ATTACK 339+#define CLIP_SHAKER_DEATH_AIR 340+#define CLIP_SHAKER_DEATH_LAND 341+#define CLIP_SHAKER_IDLE 342+#define CLIP_SHAKER_TURN 343+#define CLIP_SHAKER_WALK 344+#define CLIP_MOSQUITO_ATTACK 345+#define CLIP_MOSQUITO_ATTACK_ANTIC 346+#define CLIP_MOSQUITO_DEATH_AIR 347+#define CLIP_MOSQUITO_DEATH_LAND 348+#define CLIP_MOSQUITO_IDLE 349+#define CLIP_MOSQUITO_STARTLE 350+#define CLIP_MOSQUITO_TURNTOIDLE 351+#define CLIP_FATFLY_ATTACK 352+#define CLIP_FATFLY_DEATH_AIR 353+#define CLIP_FATFLY_DEATH_LAND 354+#define CLIP_FATFLY_FLY 355+#define CLIP_MOSSCHARGER_APPEAR 356+#define CLIP_MOSSCHARGER_CHARGE 357+#define CLIP_MOSSCHARGER_DEATH_AIR 358+#define CLIP_MOSSCHARGER_DEATH_LAND 359+#define CLIP_MOSSCHARGER_DISAPPEAR 360+#define CLIP_MOSSCHARGER_ESCAPE 361+#define CLIP_MOSSCHARGER_GET_UP 362+#define CLIP_MOSSCHARGER_STUN 363+#define CLIP_MOSSCHARGER_TURNRUN 364+#define CLIP_MOSSKNIGHT_DEATH_AIR 365+#define CLIP_MOSSKNIGHT_DEATH_LAND 366+#define CLIP_MOSSKNIGHT_DORMANT_1 367+#define CLIP_MOSSKNIGHT_DORMANT_2 368+#define CLIP_MOSSKNIGHT_EVADE 369+#define CLIP_MOSSKNIGHT_IDLE 370+#define CLIP_MOSSKNIGHT_SHAKE 371+#define CLIP_MOSSKNIGHT_SHIELD_FRONT 372+#define CLIP_MOSSKNIGHT_SHIELD_FRONT_BUMP 373+#define CLIP_MOSSKNIGHT_SHIELD_TOP 374+#define CLIP_MOSSKNIGHT_SHIELD_TOP_BUMP 375+#define CLIP_MOSSKNIGHT_SHOOT 376+#define CLIP_MOSSKNIGHT_SHOOT_END 377+#define CLIP_MOSSKNIGHT_SLASH 378+#define CLIP_MOSSKNIGHT_SLASH_2 379+#define CLIP_MOSSKNIGHT_SLASH_2_EFFECT 380+#define CLIP_MOSSKNIGHT_SLASH_EFFECT 381+#define CLIP_MOSSKNIGHT_SLASH_EFFECT_QUICK 382+#define CLIP_MOSSKNIGHT_SLASH_END 383+#define CLIP_MOSSKNIGHT_SLASH_QUICK 384+#define CLIP_MOSSKNIGHT_TURN 385+#define CLIP_MOSSKNIGHT_UNSHIELD_FRONT 386+#define CLIP_MOSSKNIGHT_UNSHIELD_TOP 387+#define CLIP_MOSSKNIGHT_WAKE 388+#define CLIP_MOSSKNIGHT_WALK 389+#define CLIP_HORNET_A_DASH 390+#define CLIP_HORNET_A_DASH_ANTIC 391+#define CLIP_HORNET_AIR_DASH_EFFECT 392+#define CLIP_HORNET_DEATH_AIR 393+#define CLIP_HORNET_EVADE 394+#define CLIP_HORNET_EVADE_ANTIC 395+#define CLIP_HORNET_FALL 396+#define CLIP_HORNET_FLASH 397+#define CLIP_HORNET_FLOURISH 398+#define CLIP_HORNET_G_DASH 399+#define CLIP_HORNET_G_DASH_ANTIC 400+#define CLIP_HORNET_G_DASH_EFFECT 401+#define CLIP_HORNET_G_DASH_RECOVER1 402+#define CLIP_HORNET_G_DASH_RECOVER2 403+#define CLIP_HORNET_HARD_LAND 404+#define CLIP_HORNET_IDLE 405+#define CLIP_HORNET_JUMP 406+#define CLIP_HORNET_JUMP_ANTIC 407+#define CLIP_HORNET_LAND 408+#define CLIP_HORNET_NEEDLE 409+#define CLIP_HORNET_NEEDLE_THREAD 410+#define CLIP_HORNET_RUN 411+#define CLIP_HORNET_SPHERE_ANTIC_A 412+#define CLIP_HORNET_SPHERE_ANTIC_G 413+#define CLIP_HORNET_SPHERE_ATTACK 414+#define CLIP_HORNET_SPHERE_BALL 415+#define CLIP_HORNET_SPHERE_RECOVER_A 416+#define CLIP_HORNET_SPHERE_RECOVER_G 417+#define CLIP_HORNET_STUN 418+#define CLIP_HORNET_STUN_AIR 419+#define CLIP_HORNET_THROW 420+#define CLIP_HORNET_THROW_ANTIC 421+#define CLIP_HORNET_THROW_EFFECT 422+#define CLIP_HORNET_THROW_RECOVER 423+#define CLIP_HORNET_WALL_IMPACT 424+#define CLIP_HORNET_WOUNDED 425+#define CLIP_BGATE_BG_OPENED 426+#define CLIP_BGATE_BG_CLOSE_1 427+#define CLIP_BGATE_BG_CLOSE_2 428+#define CLIP_BGATE_BG_OPEN 429+#define CLIP_BGATE_BG_CLOSED 430+#define CLIP_BGATE_BONE_GATE_OPENED 431+#define CLIP_BGATE_BONE_GATE_CLOSE 432+#define CLIP_BGATE_BONE_GATE_CLOSED 433+#define CLIP_BGATE_BONE_GATE_OPEN 434+#define CLIP_COCOON_COCOON_IDLE 435+#define CLIP_COCOON_COCOON_SWEAT 436+#define CLIP_COCOON_SCUTTLER_LAND 437+#define CLIP_COCOON_SCUTTLER_RUN 438+#define CLIP_FX_SPLAT 439+#define CLIP_FX_SPLAT2 440+#define CLIP_FIREBALL_BLAST 441+#define CLIP_FIREBALL_BALL 442+#define CLIP_FIREBALL_BALL_END 443+#define CLIP_FIREBALL_FIREBALL_WALL_IMPACT 444+#define CLIP_DRIP_IDLE 445+#define CLIP_DRIP_DRIP 446+#define CLIP_DRIP_FALL 447+#define CLIP_DRIP_IMPACT 448+#define CLIP_HORNETCS_EVADE 449+#define CLIP_HORNETCS_EVADE_ANTIC 450+#define CLIP_HORNETCS_FALL 451+#define CLIP_HORNETCS_HARPOON_SIDE 452+#define CLIP_HORNETCS_IDLE 453+#define CLIP_HORNETCS_JUMP_FULL 454+#define CLIP_HORNETCS_POINT 455+#define CLIP_HORNETCS_RUN 456+#define CLIP_HORNETCS_SOFT_LAND 457+#define CLIP_HORNETCS_THREAD_1 458+#define CLIP_HORNETCS_THROW_SIDE 459+#define CLIP_HORNETCS_THROW_SIDE_START 460+#define CLIP_HORNETCS_TURN 461+#define CLIP_HORNETCS_TURNTOIDLE 462+#define CLIP_BULLET_IDLE 463+#define CLIP_BULLET_IMPACT 464+#define CLIP_BULLET_SHOCKWAVE_SPURT 465+#define CLIP_PROP0_WATERFALL_LOOP 466+#define CLIP_PROP1_TORCH2 467+#define CLIP_PROP1_TORCH3 468+#define CLIP_VM0_FLOWER 469+#define CLIP_VM0_IDLE 470+#define CLIP_VM0_REACH 471+#define CLIP_VM0_REACH_TO_IDLE 472+#define CLIP_VM0_TALK_LEFT 473+#define CLIP_VM0_TALK_RIGHT 474+#define CLIP_VM0_TURN_LEFT 475+#define CLIP_VM0_TURN_RIGHT 476+#define CLIP_VM2_IDLE 477+#define CLIP_VM2_LOOKLEFT 478+#define CLIP_VM2_LOOKRIGHT 479+#define CLIP_VM3_IDLE 480+#define CLIP_VM3_TALK 481+#define CLIP_VM3_TALK_END 482+#define CLIP_VM4_IDLE 483+#define CLIP_VM4_LOOKLEFT 484+#define CLIP_VM4_LOOKRIGHT 485+#define CLIP_VM4_SIT 486+#define CLIP_VM4_SIT_TALK 487+#define CLIP_VM4_SIT_TALK_END 488+#define CLIP_VM5_DAZED 489+#define CLIP_VM5_IDLE 490+#define CLIP_VM5_WAKE 491+#define CLIP_VM8_HEGEMOL_CAST 492+#define CLIP_VM8_HEGEMOL_IDLE 493+#define CLIP_VM8_LURIEN_CAST 494+#define CLIP_VM8_LURIEN_IDLE 495+#define CLIP_VM8_MONOMON_CAST 496+#define CLIP_VM8_MONOMON_IDLE 497+#define CLIP_VM9_IDLE 498+#define CLIP_VM9_SIT_IDLE 499+#define CLIP_VM9_SIT_TALK 500+#define CLIP_VM9_SIT_TALK_END 501+#define CLIP_VM9_SUMMON 502+#define CLIP_VM9_TALK 503+#define CLIP_VM9_TALK_END 504+#define CLIP_VM9_TURN 505+#define CLIP_ANIM0_DASH_CLOAK_CORPSE000 506+#define CLIP_ANIM1_GROUND_PLINK_0 507+#define CLIP_ANIM2_FIREBALL_COLLECT_ANIM 508+#define SPRITE_HERO_LIGHT 2251+#define SPRITE_DIALOGUE_BACKBOARD 2252+#define SPRITE_PROMPT_SHADOW 2253+#define SPRITE_CORPSE_NAIL 2254+#define SPRITE_FK_BARREL 2255+#define SPRITE_FK_STAFF 2256+#define SPRITE_DIGIT0 2544#define STYLE_DIALOGUE 0#define STYLE_PROMPT 1#define STYLE_TITLE_L 2@@ -613,7 +618,7 @@#define EK_MOSSKNIGHT 28#define EK_HORNET 29#define NUM_KINDS 30-#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 162, 161, -1, -1, -1, -1, -1, -1, -1, -1, 164, 165}}, {EF_BUZZER, {167, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 169, 170}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 177, 176, -1, -1, -1, -1, -1, -1, -1, 174, 175}}, {EF_BOUNCER, {-1, -1, -1, 180, -1, -1, -1, -1, -1, -1, -1, 178, 179}}, {EF_SPITTER, {-1, -1, -1, 183, 184, 182, -1, -1, -1, -1, -1, 181, -1}}, {EF_ROLLER, {187, -1, -1, 189, 188, 190, -1, -1, -1, -1, -1, 185, 186}}, {EF_BLOCKER, {197, -1, -1, 193, 198, 191, 192, 199, 200, 196, 195, -1, 194}}, {EF_HUSK, {206, 207, 208, 201, 203, 202, -1, -1, -1, -1, -1, 204, 205}}, {EF_HUSK, {214, 215, 216, 209, 211, 210, -1, -1, -1, -1, -1, 212, 213}}, {EF_HUSK, {222, 223, 224, 217, 219, 218, -1, -1, -1, -1, -1, 220, 221}}, {EF_HUSK, {230, 231, 232, 225, 227, 226, -1, -1, -1, -1, -1, 228, 229}}, {EF_LEAPER, {236, 238, 239, 233, 237, -1, -1, -1, -1, -1, -1, 234, 235}}, {EF_GUARD, {245, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 242, 243}}, {EF_FK, {267, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 265}}, {EF_FKHEAD, {287, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 285}}, {EF_HATCHER, {-1, -1, -1, 292, 291, -1, -1, -1, -1, -1, -1, 289, 290}}, {EF_HATCHLING, {-1, -1, -1, 293, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {299, -1, -1, 297, 298, 301, 300, 294, -1, -1, -1, 295, 296}}, {EF_GFLY, {314, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 323, 324, 322, 318, 319, -1, -1, -1, -1, -1, 320, 321}}, {EF_PIGEON, {-1, -1, -1, 326, 327, 328, 325, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {330, -1, -1, 333, 332, 331, -1, -1, -1, -1, -1, 329, -1}}, {EF_SHAKER, {337, 338, 339, 334, -1, -1, -1, -1, -1, -1, -1, 335, 336}}, {EF_MOSQUITO, {344, -1, -1, 346, 345, 341, 340, -1, -1, -1, -1, 342, 343}}, {EF_FATFLY, {350, -1, -1, 347, -1, -1, -1, -1, -1, -1, -1, 348, 349}}, {EF_MOSSCHARGER, {-1, -1, -1, 351, 352, 355, 358, 357, 359, 356, -1, 353, 354}}, {EF_MOSSKNIGHT, {365, 380, 384, -1, -1, -1, -1, -1, -1, -1, -1, 360, 361}}, {EF_HORNET, {400, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 388, -1}}}+#define KIND_TABLE {{0}, {EF_CRAWLER, {-1, 167, 166, -1, -1, -1, -1, -1, -1, -1, -1, 169, 170}}, {EF_BUZZER, {172, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 174, 175}}, {EF_SHADE, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_CLIMBER, {-1, -1, 182, 181, -1, -1, -1, -1, -1, -1, -1, 179, 180}}, {EF_BOUNCER, {-1, -1, -1, 185, -1, -1, -1, -1, -1, -1, -1, 183, 184}}, {EF_SPITTER, {-1, -1, -1, 188, 189, 187, -1, -1, -1, -1, -1, 186, -1}}, {EF_ROLLER, {192, -1, -1, 194, 193, 195, -1, -1, -1, -1, -1, 190, 191}}, {EF_BLOCKER, {202, -1, -1, 198, 203, 196, 197, 204, 205, 201, 200, -1, 199}}, {EF_HUSK, {211, 212, 213, 206, 208, 207, -1, -1, -1, -1, -1, 209, 210}}, {EF_HUSK, {219, 220, 221, 214, 216, 215, -1, -1, -1, -1, -1, 217, 218}}, {EF_HUSK, {227, 228, 229, 222, 224, 223, -1, -1, -1, -1, -1, 225, 226}}, {EF_HUSK, {235, 236, 237, 230, 232, 231, -1, -1, -1, -1, -1, 233, 234}}, {EF_LEAPER, {241, 243, 244, 238, 242, -1, -1, -1, -1, -1, -1, 239, 240}}, {EF_GUARD, {250, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 247, 248}}, {EF_FK, {272, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 270}}, {EF_FKHEAD, {292, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 290}}, {EF_HATCHER, {-1, -1, -1, 297, 296, -1, -1, -1, -1, -1, -1, 294, 295}}, {EF_HATCHLING, {-1, -1, -1, 298, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_SLUG, {304, -1, -1, 302, 303, 306, 305, 299, -1, -1, -1, 300, 301}}, {EF_GFLY, {319, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}, {EF_MOSSWALKER, {-1, 328, 329, 327, 323, 324, -1, -1, -1, -1, -1, 325, 326}}, {EF_PIGEON, {-1, -1, -1, 331, 332, 333, 330, -1, -1, -1, -1, -1, -1}}, {EF_PLANTTRAP, {335, -1, -1, 338, 337, 336, -1, -1, -1, -1, -1, 334, -1}}, {EF_SHAKER, {342, 343, 344, 339, -1, -1, -1, -1, -1, -1, -1, 340, 341}}, {EF_MOSQUITO, {349, -1, -1, 351, 350, 346, 345, -1, -1, -1, -1, 347, 348}}, {EF_FATFLY, {355, -1, -1, 352, -1, -1, -1, -1, -1, -1, -1, 353, 354}}, {EF_MOSSCHARGER, {-1, -1, -1, 356, 357, 360, 363, 362, 364, 361, -1, 358, 359}}, {EF_MOSSKNIGHT, {370, 385, 389, -1, -1, -1, -1, -1, -1, -1, -1, 365, 366}}, {EF_HORNET, {405, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 393, -1}}}#define TXT_PROMPT_LISTEN 50#define TXT_PROMPT_REST 51#define TXT_PROMPT_INSPECT 52@@ -792,63 +797,63 @@#define TITLE_CHARM_SLUG 19#define NUM_TITLES 20#define TITLE_TABLE {{64, 65, -1, -1}, {66, 67, 68, -1}, {69, 70, -1, 71}, {72, 73, -1, 74}, {75, 76, -1, 77}, {78, 79, -1, -1}, {80, 81, 82, -1}, {83, 84, -1, -1}, {85, 86, -1, -1}, {87, 88, -1, -1}, {89, 90, -1, -1}, {91, 92, -1, -1}, {93, 94, -1, -1}, {95, 96, -1, -1}, {97, 98, -1, 99}, {100, 101, -1, 102}, {100, 101, -1, 103}, {104, 105, 106, -1}, {104, 105, -1, -1}, {107, 108, -1, 109}}-#define SPRITE_FLEUR_TOP 2237+#define SPRITE_FLEUR_TOP 2257#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 2238+#define SPRITE_FLEUR_BOT 2258#define FLEUR_BOT_RECTS {{0.000f, 0.000f, 0.016f, 0.016f}, {0.000f, 0.000f, 0.016f, 0.016f}, {0.391f, 0.406f, 0.828f, 0.844f}, {-1.063f, 0.281f, 1.516f, 1.016f}, {-1.594f, -0.047f, 2.109f, 1.031f}, {-1.984f, -0.156f, 2.375f, 1.047f}, {-2.531f, -0.438f, 2.719f, 1.172f}, {-2.688f, -0.594f, 2.766f, 1.188f}, {-2.797f, -0.797f, 3.156f, 1.219f}, {-3.078f, -0.938f, 3.219f, 1.219f}, {-3.250f, -1.156f, 3.438f, 1.219f}, {-3.250f, -1.172f, 3.828f, 1.219f}, {-3.781f, -1.188f, 4.203f, 1.234f}, {-3.984f, -1.188f, 4.344f, 1.234f}, {-4.281f, -1.203f, 4.562f, 1.234f}, {-4.406f, -1.203f, 4.641f, 1.234f}, {-4.578f, -1.219f, 4.719f, 1.234f}, {-4.656f, -1.219f, 4.719f, 1.234f}, {-4.734f, -1.219f, 4.734f, 1.234f}, {-4.750f, -1.234f, 4.734f, 1.234f}, {-4.766f, -1.234f, 4.734f, 1.250f}, {-4.766f, -1.234f, 4.734f, 1.250f}}-#define SPRITE_MSG_BG 2239-#define SPRITE_MSG_STOP 2240-#define SPRITE_MSG_FLEUR 2241-#define SPRITE_MSG_KEY 2242-#define SPRITE_MSG_ICON_FIREBALL 2243-#define SPRITE_MSG_ICON_DASH 2244-#define SPRITE_GRASS_BALL 2245+#define SPRITE_MSG_BG 2259+#define SPRITE_MSG_STOP 2260+#define SPRITE_MSG_FLEUR 2261+#define SPRITE_MSG_KEY 2262+#define SPRITE_MSG_ICON_FIREBALL 2263+#define SPRITE_MSG_ICON_DASH 2264+#define SPRITE_GRASS_BALL 2265#define MSG_TABLE {{110, 111, 112, 113, 114, 115}, {116, 117, 118, 119, 120, 121}}-#define NOTICE_BACKBOARD {2246, 1.0000f, 0.6931f}-#define TUTE_FLEUR {2241, 1.0000f, 1.0000f}-#define TUTE_BACKBOARD {2247, 1.0000f, 0.9560f}-#define TUTE_IMAGE {2248, 1.0000f, 1.0000f}-#define TUTE_STOP {2240, 1.0000f, 1.0000f}-#define NOTICE_ICONS {2249, 2250, 2251}+#define NOTICE_BACKBOARD {2266, 1.0000f, 0.6931f}+#define TUTE_FLEUR {2261, 1.0000f, 1.0000f}+#define TUTE_BACKBOARD {2267, 1.0000f, 0.9560f}+#define TUTE_IMAGE {2268, 1.0000f, 1.0000f}+#define TUTE_STOP {2260, 1.0000f, 1.0000f}+#define NOTICE_ICONS {2269, 2270, 2271}#define CHARM_ICON_K 1.5000f-#define CHARM_ICONS {-1, 2252, 2253, 2254, 2255, -1, 2256, 2257, 2258, -1, -1, -1, -1, -1, 2259, -1, -1, -1, 2260, 2261, 2262, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CHARM_ICONS {-1, 2272, 2273, 2274, 2275, -1, 2276, 2277, 2278, -1, -1, -1, -1, -1, 2279, -1, -1, -1, 2280, 2281, 2282, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}#define CHARM_NAMES {-1, 122, 123, 124, 125, -1, 126, 127, 128, -1, -1, -1, -1, -1, 129, -1, -1, -1, 130, 131, 132, -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 133#define TXT_CHARM_TUTE_SUB 134#define TXT_CHARM_REMINDER 135-#define MENU_LOGO {2263, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_LOGO {2283, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_LOGO_Y 3.6585f#define MENU_START_Y -1.4181f#define MENU_QUIT_Y -2.3582f-#define MENU_POINTER {2264, 0.0000f, 0.0000f, 1.0023f, 1.0000f}+#define MENU_POINTER {2284, 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 {2265, 0.0000f, 0.0000f, 1.0000f, 1.0807f}+#define MENU_PROFILES_FLEUR {2285, 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, {2266, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2267, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2268, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2269, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2270, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}+#define MENU_SLOT_ZONES {{2, {2286, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {4, {2287, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {5, {2288, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {6, {2289, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}, {22, {2290, 0.0000f, 0.0000f, 1.0000f, 1.0000f}}}#define MENU_SLOT_NZONES 5#define MENU_SLOT_BG_DY 0.0102f-#define MENU_SLOT_FLEUR {2271, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_FLEUR {2291, 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 {2272, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_SELECTOR {2292, 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 {2273, 0.0000f, 0.0000f, 1.0000f, 1.0025f}+#define MENU_SLOT_CURSOR {2293, 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 {2274, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_ORB {2294, 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 {2275, 0.0000f, 0.0000f, 1.0039f, 1.0000f}+#define MENU_SLOT_GEO {2295, 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 {2276, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_SLOT_HEALTH {2296, 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@@ -866,9 +871,9 @@#define MENU_SLOT_YES_X 2.5813f#define MENU_SLOT_NO_X 6.2296f#define MENU_BACK_Y -5.5406f-#define MENU_PAUSE_TOP {2277, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_TOP {2297, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_TOP_Y 2.3653f-#define MENU_PAUSE_BOT {2278, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define MENU_PAUSE_BOT {2298, 0.0000f, 0.0000f, 1.0000f, 1.0000f}#define MENU_PAUSE_BOT_Y -1.8877f#define MENU_PAUSE_CONTINUE_Y 0.6428f#define MENU_PAUSE_QUIT_Y -0.4548f@@ -887,39 +892,39 @@#define TXT_ZONES {148, 149, 150, 151, 152}#define INV_X -4.0500f#define INV_Y 7.5500f-#define INV_BORDER {{2279, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2279, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2280, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2281, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2282, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2283, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}+#define INV_BORDER {{2299, -8.0000f, -2.8100f, 1.0000f, 1.0000f}, {2299, 16.1400f, -2.8100f, -1.0000f, 1.0000f}, {2300, -8.0000f, -12.8700f, 0.9877f, -1.0000f}, {2301, 16.2400f, -12.8700f, -1.0000f, -1.0000f}, {2302, 3.9400f, -0.6200f, 1.0000f, 1.0000f}, {2303, 4.0000f, -14.3600f, 1.0000f, 1.0000f}}#define INV_NBORDER 6-#define INV_FRAME {2284, 4.0479f, -7.1963f, 1.0f, 1.0f}-#define INV_ARROW_L {2285, -9.8300f, -7.2000f, 1.0000f, 1.0000f}-#define INV_ARROW_R {2285, 18.0300f, -7.2000f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_L {2286, -9.8600f, -0.4300f, -1.0000f, 1.0000f}-#define INV_PANE_ARROW_R {2286, 18.0400f, -0.4300f, 1.0000f, 1.0000f}+#define INV_FRAME {2304, 4.0479f, -7.1963f, 1.0f, 1.0f}+#define INV_ARROW_L {2305, -9.8300f, -7.2000f, 1.0000f, 1.0000f}+#define INV_ARROW_R {2305, 18.0300f, -7.2000f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_L {2306, -9.8600f, -0.4300f, -1.0000f, 1.0000f}+#define INV_PANE_ARROW_R {2306, 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 {155, 156, 157, 158}-#define CH_BB {2287, -7.9200f, -8.3700f, 1.0000f, 1.0000f}+#define CH_BB {2307, -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 {2288, 0.0500f, 0.0600f, 1.0000f, 0.9919f}+#define CH_GLOW {2308, 0.0500f, 0.0600f, 1.0000f, 0.9919f}#define CH_GLOW_A 0.6970f-#define CH_ICONS {-1, 2252, 2253, 2254, 2255, -1, 2256, 2257, 2258, -1, -1, -1, -1, -1, 2259, -1, -1, -1, 2260, 2261, 2262, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}-#define CH_NEXT_DOT {2289, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_ICONS {-1, 2272, 2273, 2274, 2275, -1, 2276, 2277, 2278, -1, -1, -1, -1, -1, 2279, -1, -1, -1, 2280, 2281, 2282, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}+#define CH_NEXT_DOT {2309, 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 {2290, 0.0000f, 0.0000f, 1.0000f, 1.0000f}-#define CH_NOTCH_EMPTY {2291, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_FULL {2310, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_NOTCH_EMPTY {2311, 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 {2292, -0.8400f, -6.9300f, 1.0000f, 0.1591f}+#define CH_DIVIDER {2312, -0.8400f, -6.9300f, 1.0000f, 0.1591f}#define CH_COST_TEXT {10.7172f, -3.3457f, 5.4345f}-#define CH_COST_PIP {2290, 0.0000f, 0.0000f, 1.0000f, 1.0000f}+#define CH_COST_PIP {2310, 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@@ -928,9 +933,9 @@#define CH_NAME {12.4800f, -2.2710f, 8.8867f}#define CH_DESC {8.0382f, -7.3673f, 8.8867f}#define CH_CONFIRM {15.7465f, -13.0221f, 15.3500f}-#define CH_CONFIRM_KEY {2293, 16.3208f, -13.2878f, 1.0f, 1.0f}+#define CH_CONFIRM_KEY {2313, 16.3208f, -13.2878f, 1.0f, 1.0f}#define CH_CONFIRM_KEY_W 0.6412f-#define CH_CURSOR {2294, 0.0000f, 0.0000f, 1.0000f, 0.9756f}+#define CH_CURSOR {2314, 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 159@@ -944,23 +949,23 @@#define TXT_CHARM_NAMES_INV {-1, 167, 168, 169, 170, -1, 171, 172, 173, -1, -1, -1, -1, -1, 174, -1, -1, -1, 175, 176, 177, -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, 178, 179, 180, 181, -1, 182, 183, 184, -1, -1, -1, -1, -1, 185, -1, -1, -1, 186, 187, 188, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}#define TXT_KEY_OK 189-#define INV_FIXED {{2295, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2296, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2297, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2298, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2299, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2300, -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}, {2301, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2302, -3.2774f, -7.4713f, 1.0000f, 1.0000f}, {-1, 0, 0, 0, 0}}+#define INV_FIXED {{2315, -7.1600f, -3.8300f, 1.0000f, 1.0000f}, {2316, -3.2500f, -4.2100f, 1.0000f, 1.0000f}, {2317, -7.2900f, -9.4400f, 1.0000f, 1.0000f}, {2318, -4.7200f, -6.2100f, 1.0000f, 1.0000f}, {2319, -3.2700f, -7.4600f, 1.0000f, 1.0000f}, {2320, -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}, {2321, -4.6374f, -6.2413f, 1.0000f, 1.0000f}, {2322, -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 {{2303, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2304, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2305, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2306, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}-#define INV_VESSEL_PIECES {{2307, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2308, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2309, -3.2500f, -4.1540f, 1.0000f, 1.0000f}}+#define INV_HEART_PIECES {{2323, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2324, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2325, -7.1460f, -3.5360f, 1.0000f, 1.0000f}, {2326, -7.1460f, -3.5360f, 1.0000f, 1.0000f}}+#define INV_VESSEL_PIECES {{2327, -3.5860f, -4.3220f, 1.0000f, 1.0000f}, {2328, -3.2892f, -4.3556f, 1.0000f, 1.0000f}, {2329, -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 {{2310, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2311, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2312, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2313, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2314, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2315, 1.1300f, -3.8000f, 1.0000f, 1.0000f}}+#define INV_EQ {{2330, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2331, 1.1000f, -3.8000f, 1.0000f, 1.0000f}, {2332, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2333, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2334, 1.1300f, -3.8000f, 1.0000f, 1.0000f}, {2335, 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 {{2316, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2317, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2318, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2319, 7.4000f, -10.7800f, 1.0000f, 1.0000f}}+#define INV_TRINKETS {{2336, 1.1000f, -10.7400f, 1.0000f, 1.0000f}, {2337, 3.1800f, -10.7400f, 1.0000f, 1.0000f}, {2338, 5.2600f, -10.7400f, 1.0000f, 1.0000f}, {2339, 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 {2320, 4.2400f, -10.8700f, 1.0000f, 1.0000f}-#define INV_DIVIDERS {{2321, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2321, 8.7300f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}}+#define INV_TRINKET_BB {2340, 4.2400f, -10.8700f, 1.0000f, 1.0000f}+#define INV_DIVIDERS {{2341, -0.1800f, -7.5100f, 1.0000f, 0.2443f, -90.0000f}, {2341, 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 {{190, 191}, {192, 193}, {194, 195}, {192, 196}, {192, 197}, {198, 199}}diff --git a/games/hollowknight/src/enemy.c b/games/hollowknight/src/enemy.cindex 430b9b46..09a243d7 100644--- a/games/hollowknight/src/enemy.c+++ b/games/hollowknight/src/enemy.c@@ -174,10 +174,11 @@ typedef struct {bool on;uint8_t type; /* 0 small (1), 1 medium (5), 2 large (25) */uint8_t ncontacts, ccol[GEO_CONTACTS];+ uint8_t getter; /* (Gathering Swarm: its bug's chances, 1 + a number; 0: none) */float x, y, vx, vy;float cnx[GEO_CONTACTS], cny[GEO_CONTACTS];Anim anim;- float pickup_t;+ float age; /* (since it was flung: picked up after 0.25 s) */} Geo;static Geo geo[MAX_GEO];static const struct {@@ -207,10 +208,23 @@ void geo_fling_at(int type, int n, float x, float y, float smin, float smax, flofloat s = rand_range(smin, smax), a = rand_range(amin, amax) * (float)M_PI / 180;g->vx = cosf(a) * s, g->vy = sinf(a) * s;anim_play(&g->anim, geo_kinds[type].air);- g->pickup_t = 0.25f;+ /* (GeoControl.OnEnable: the Getter with Gathering Swarm, but at the Grubfather's) */+ if (charm_on(1) && strcmp(room_name(g_room.id), "Crossroads_38")) g->getter = (uint8_t)(1 + rand_range(0, 254.999f));}}+/* the Getter's chances, from its number: the wait before the bug comes, its ease time, where it comes from */+static float getter_rand(const Geo *g, int k, float lo, float hi) {+ uint32_t h = (uint32_t)g->getter * 2654435761u + (uint32_t)k * 40503u;+ h ^= h >> 13, h *= 0x5bd1e995u, h ^= h >> 15;+ return lo + (hi - lo) * (float)(h & 0xffff) / 65535.0f;+}+#define GETTER_X (-0.06624349f) /* (the bug's place on the geo) */+#define GETTER_Y 0.1932119f+static float getter_wait(const Geo *g) { return getter_rand(g, 0, 1, 1.7f); }+static float getter_ease(const Geo *g) { return getter_rand(g, 1, 0.3f, 0.5f); }+static bool geo_attracted(const Geo *g) { return g->getter && g->age >= getter_wait(g) + getter_ease(g); }+/* ObjectBounce: off what it hit, at its speed before, times the bounce factor (and a little chance) */void body_bounce(Body *b, float pvx, float pvy, int had, float factor) {if (factor < 0 || b->ncontacts <= had) return;@@ -229,31 +243,44 @@ static void geo_tick(void) {for (int i = 0; i < MAX_GEO; i++) {Geo *g = &geo[i];if (!g->on) continue;- Body b;- memset(&b, 0, sizeof b);- b.x = g->x, b.y = g->y, b.vx = g->vx, b.vy = g->vy;- b.ox = geo_kinds[g->type].ox * GEO_SCALE, b.oy = geo_kinds[g->type].oy * GEO_SCALE;- b.hx = geo_kinds[g->type].hx * GEO_SCALE, b.hy = geo_kinds[g->type].hy * GEO_SCALE;- b.gravity_scale = geo_kinds[g->type].gravity, b.friction = 0.2f, b.mask = CF_TERRAIN;- b.ncontacts = g->ncontacts;- for (int c = 0; c < g->ncontacts; c++) b.ccol[c] = g->ccol[c], b.cnx[c] = g->cnx[c], b.cny[c] = g->cny[c];- float pvx = b.vx, pvy = b.vy;- int had = b.ncontacts;- body_step(&b, DT);- bool hit = b.ncontacts > had;- if (hit) body_bounce(&b, pvx, pvy, had, geo_kinds[g->type].bounce);- g->x = b.x, g->y = b.y, g->vx = b.vx, g->vy = b.vy;- g->ncontacts = (uint8_t)(b.ncontacts < GEO_CONTACTS ? b.ncontacts : GEO_CONTACTS);- for (int c = 0; c < g->ncontacts; c++) g->ccol[c] = b.ccol[c], g->cnx[c] = b.cnx[c], g->cny[c] = b.cny[c];- if (hit) {- /* (OnCollisionEnter2D: the idle animation from a random frame) */- anim_play_from_frame(&g->anim, geo_kinds[g->type].idle, (int)rand_range(0, (float)clip_frames_count(geo_kinds[g->type].idle) - 0.001f));+ g->age += DT;+ float ox = geo_kinds[g->type].ox * GEO_SCALE, oy = geo_kinds[g->type].oy * GEO_SCALE;+ float bhx = geo_kinds[g->type].hx * GEO_SCALE, bhy = geo_kinds[g->type].hy * GEO_SCALE;+ if (geo_attracted(g)) {+ /* (Gathering Swarm, attracted: no gravity, a trigger through all; pulled to below the Knight, at most 20 a+ * second) */+ float dx = h->body.x - g->x, dy = h->body.y - 0.5f - g->y, d = sqrtf(dx * dx + dy * dy);+ if (d > 1) dx /= d, dy /= d;+ g->vx += dx * 150 * DT, g->vy += dy * 150 * DT;+ float v = sqrtf(g->vx * g->vx + g->vy * g->vy);+ if (v > 20) g->vx *= 20 / v, g->vy *= 20 / v;+ g->x += g->vx * DT, g->y += g->vy * DT;+ g->ncontacts = 0;+ } else {+ Body b;+ memset(&b, 0, sizeof b);+ b.x = g->x, b.y = g->y, b.vx = g->vx, b.vy = g->vy;+ b.ox = ox, b.oy = oy, b.hx = bhx, b.hy = bhy;+ b.gravity_scale = geo_kinds[g->type].gravity, b.friction = 0.2f, b.mask = CF_TERRAIN;+ b.ncontacts = g->ncontacts;+ for (int c = 0; c < g->ncontacts; c++) b.ccol[c] = g->ccol[c], b.cnx[c] = g->cnx[c], b.cny[c] = g->cny[c];+ float pvx = b.vx, pvy = b.vy;+ int had = b.ncontacts;+ body_step(&b, DT);+ bool hit = b.ncontacts > had;+ if (hit) body_bounce(&b, pvx, pvy, had, geo_kinds[g->type].bounce);+ g->x = b.x, g->y = b.y, g->vx = b.vx, g->vy = b.vy;+ g->ncontacts = (uint8_t)(b.ncontacts < GEO_CONTACTS ? b.ncontacts : GEO_CONTACTS);+ for (int c = 0; c < g->ncontacts; c++) g->ccol[c] = b.ccol[c], g->cnx[c] = b.cnx[c], g->cny[c] = b.cny[c];+ if (hit) {+ /* (OnCollisionEnter2D: the idle animation from a random frame) */+ anim_play_from_frame(&g->anim, geo_kinds[g->type].idle, (int)rand_range(0, (float)clip_frames_count(geo_kinds[g->type].idle) - 0.001f));+ }}g->anim.events = 0;anim_update(&g->anim, DT);- if (g->pickup_t > 0) g->pickup_t -= DT;- float x0 = b.x + b.ox - b.hx, x1 = b.x + b.ox + b.hx, y0 = b.y + b.oy - b.hy, y1 = b.y + b.oy + b.hy;- if (g->pickup_t <= 0 && !h->hidden && x1 > hx - 0.2277069f && x0 < hx + 0.2277069f && y1 > hy - 0.5848932f &&+ float x0 = g->x + ox - bhx, x1 = g->x + ox + bhx, y0 = g->y + oy - bhy, y1 = g->y + oy + bhy;+ if (g->age >= 0.25f && !h->hidden && x1 > hx - 0.2277069f && x0 < hx + 0.2277069f && y1 > hy - 0.5848932f &&y0 < hy + 0.5848932f) {hero_add_geo(geo_kinds[g->type].value);g->on = false;@@ -6670,6 +6697,17 @@ void enemies_draw(void) {Inst in;sprite_inst(g->anim.sprite, g->x, g->y, 0.0015f, GEO_SCALE, GEO_SCALE, 0, &in);gfx_actor(&in, SORT_KEY(0, 0));+ /* (Gathering Swarm: its bug, eased in from above it to its place, then carrying it; Lamp_Bug_idle from its+ * start) */+ float t = g->getter ? g->age - getter_wait(g) : -1;+ if (t < 0) continue;+ float e = getter_ease(g), q = t >= e ? 1 : sinf(t / e * 1.5707964f);+ float sx = GETTER_X + getter_rand(g, 2, -1, 1), sy = GETTER_Y + getter_rand(g, 3, 0.5f, 1.5f);+ float bx = sx + (GETTER_X - sx) * q, by = sy + (GETTER_Y - sy) * q;+ int n = clip_frames_count(CLIP_GEOBUG_LAMP_BUG_IDLE);+ sprite_inst(clip_frame_sprite(CLIP_GEOBUG_LAMP_BUG_IDLE, (int)(t * 12) % n), g->x + bx * GEO_SCALE,+ g->y + by * GEO_SCALE, 0.0005f, GEO_SCALE * 1.4838f, GEO_SCALE * 1.4838f, 0, &in);+ gfx_actor(&in, SORT_KEY(0, 0));}}diff --git a/games/hollowknight/src/game.c b/games/hollowknight/src/game.cindex 335a2812..aefd7854 100644--- a/games/hollowknight/src/game.c+++ b/games/hollowknight/src/game.c@@ -68,7 +68,7 @@ bool game_respawn(void) {}hero_init(x, y, right);g_hero.body.y = hero_ground_y(x, y);- g_pd.health = g_pd.max_health;+ hero_charm_update(); /* (CharmUpdate, MaxHealth) */g_pd.mp = 0; /* (ClearMP) */g_game.hazard_x = g_hero.body.x, g_game.hazard_y = g_hero.body.y, g_game.hazard_facing_right = right;world_hero_in_position();diff --git a/games/hollowknight/src/game.h b/games/hollowknight/src/game.hindex d73a04f6..ceceb750 100644--- a/games/hollowknight/src/game.h+++ b/games/hollowknight/src/game.h@@ -72,6 +72,8 @@ typedef struct {#define PD_SAVED offsetof(PlayerData, persist)extern PlayerData g_pd;static inline bool pd_flag(int f) { return g_pd.flags[f >> 3] >> (f & 7) & 1; }+/* (equippedCharm_N) */+static inline bool charm_on(int id) { return pd_flag(PDF_EQUIPPED_CHARM_1 + id - 1); }static inline void pd_set_flag(int f, bool on) {if (on) g_pd.flags[f >> 3] |= (uint8_t)(1 << (f & 7));else g_pd.flags[f >> 3] &= (uint8_t)~(1 << (f & 7));@@ -216,6 +218,7 @@ enum { ATK_NORMAL, ATK_UP, ATK_DOWN };enum { SLASH_NORMAL, SLASH_ALT, SLASH_UP, SLASH_DOWN };enum { DAMAGE_FULL, DAMAGE_HAZARD_ONLY, DAMAGE_NONE };#define RECOIL_DURATION 0.2f+#define RECOIL_DURATION_STAL 0.08f /* (Stalwart Shell) */typedef struct { /* HeroControllerStates */bool facing_right, on_ground, jumping, dashing, falling, attacking, up_attacking, down_attacking, alt_attack;@@ -249,6 +252,7 @@ typedef struct {bool invuln_routine, pulsing, pulse_reverse, respawning;int8_t thunk_dir;bool thunk_hit;+ bool fury; /* (Charm Effects' Fury: on at one mask, with Fury of the Fallen) */float thunk_timer;/* HeroAnimationController */Anim anim;diff --git a/games/hollowknight/src/hero.c b/games/hollowknight/src/hero.cindex 18882421..5d01aa9d 100644--- a/games/hollowknight/src/hero.c+++ b/games/hollowknight/src/hero.c@@ -290,7 +290,7 @@ void hero_nail_parry(void) { g_hero.parry_t = 0.25f; }void hero_recoil_left(void) {Hero *h = &g_hero;- if (!h->cs.recoiling_left && !h->cs.recoiling_right && !h->control_relinquished) {+ if (!h->cs.recoiling_left && !h->cs.recoiling_right && !charm_on(14) && !h->control_relinquished) {cancel_dash();h->recoil_steps = 0;h->cs.recoiling_left = true, h->cs.recoiling_right = false;@@ -300,7 +300,7 @@ void hero_recoil_left(void) {}void hero_recoil_right(void) {Hero *h = &g_hero;- if (!h->cs.recoiling_left && !h->cs.recoiling_right && !h->control_relinquished) {+ if (!h->cs.recoiling_left && !h->cs.recoiling_right && !charm_on(14) && !h->control_relinquished) {cancel_dash();h->recoil_steps = 0;h->cs.recoiling_right = true, h->cs.recoiling_left = false;@@ -329,7 +329,7 @@ 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;+ float len = (h->thunk_dir == ATK_NORMAL ? 2.0f : 1.5f) * (charm_on(18) ? 1.2f : 1.0f); /* (Longnail) */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;@@ -595,7 +595,7 @@ static void update(void) {if (h->hard_landing_timer > HARD_LANDING_TIME) set_state(HS_GROUNDED), back_on_ground();} else if (h->state == HS_NO_INPUT) {if (h->cs.recoiling) {- if (h->recoil_timer < RECOIL_DURATION) h->recoil_timer += DT;+ if (h->recoil_timer < (charm_on(4) ? RECOIL_DURATION_STAL : RECOIL_DURATION)) h->recoil_timer += DT;else {h->cs.recoiling = false, h->recoil_timer = 0, reset_motion(), affected_by_gravity(true);h->damage_mode = DAMAGE_FULL;@@ -642,12 +642,13 @@ static void update(void) {if (h->attack_cooldown > 0) h->attack_cooldown -= DT;if (h->dash_cooldown_timer > 0) h->dash_cooldown_timer -= DT;terrain_thunk();+ if (h->fury && g_pd.health != 1) h->fury = false; /* (Fury: Recheck, healed; Deactivate) */}/* ---------------------------------------------------------------- HeroAnimationController */static void play_idle(void) {Hero *h = &g_hero;- if (g_pd.health == 1 && g_pd.health_blue < 1) anim_play(&h->anim, CLIP_KNIGHT_IDLE_HURT);+ if (g_pd.health == 1 && g_pd.health_blue < 1) anim_play(&h->anim, charm_on(6) ? CLIP_KNIGHT_IDLE : CLIP_KNIGHT_IDLE_HURT);else if (anim_is_playing(&h->anim, CLIP_KNIGHT_LOOKUP)) anim_play(&h->anim, CLIP_KNIGHT_LOOKUPEND);else if (anim_is_playing(&h->anim, CLIP_KNIGHT_LOOKDOWN)) anim_play(&h->anim, CLIP_KNIGHT_LOOKDOWNEND);else anim_play(&h->anim, CLIP_KNIGHT_IDLE);@@ -852,16 +853,18 @@ void hero_die(void) {/* ---------------------------------------------------------------- NailSlash: the slash effect, a child of the Knight */static const struct {- int clip;+ int clip, fury; /* (its animation; " F": while the Fury is on) */float x, y, z, sx, sy; /* its place and scale on the Knight */} slashes[4] = {- {CLIP_KNIGHT_SLASHEFFECT, -0.01f, -0.41f, -0.001f, 1.6010780f, 1.6452440f},- {CLIP_KNIGHT_SLASHEFFECTALT, 0.08f, -0.436f, -0.001f, 1.2569700f, 1.4224339f},- {CLIP_KNIGHT_UPSLASHEFFECT, 0.0f, 0.69f, -0.001f, 1.15f, 1.4f},- {CLIP_KNIGHT_DOWNSLASHEFFECT, 0.16f, -1.59f, 0.0f, 1.125f, 1.28002f},+ {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},};+#define LONGNAIL 1.15f /* (NailSlash.StartSlash: Longnail's scale) */static struct {int kind;+ float k; /* (its scale: Longnail's) */bool slashing, shown, anim_completed;int step_counter, poly_counter;bool poly;@@ -870,8 +873,10 @@ static struct {void slash_start(int kind) {sl.kind = kind;- anim_play(&sl.anim, slashes[kind].clip);- anim_play_from_frame(&sl.anim, slashes[kind].clip, 0);+ sl.k = charm_on(18) ? LONGNAIL : 1;+ int clip = g_hero.fury ? slashes[kind].fury : slashes[kind].clip;+ anim_play(&sl.anim, clip);+ anim_play_from_frame(&sl.anim, clip, 0);sl.step_counter = sl.poly_counter = 0;sl.poly = false;sl.anim_completed = false;@@ -918,8 +923,8 @@ static void slash_hits(void) {const typeof(slashes[0]) *s = &slashes[sl.kind];float pts[12];for (int i = 0; i < 6; i++) {- pts[2 * i] = h->body.x + k * (s->x + s->sx * slash_poly[sl.kind][2 * i]);- pts[2 * i + 1] = h->body.y + s->y + s->sy * slash_poly[sl.kind][2 * i + 1];+ 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;int fl = obj_nail(pts, 6, direction);@@ -946,7 +951,7 @@ void slash_draw(void) {float k = h->cs.facing_right ? -1.0f : 1.0f; /* the Knight's x scale */const typeof(slashes[0]) *s = &slashes[sl.kind];Inst in;- sprite_inst(sl.anim.sprite, h->body.x + k * s->x, h->body.y + s->y, 0.004f + s->z, k * s->sx, s->sy, 0, &in);+ sprite_inst(sl.anim.sprite, h->body.x + k * s->x, h->body.y + s->y, 0.004f + s->z, k * s->sx * sl.k, s->sy * sl.k, 0, &in);gfx_actor(&in, SORT_KEY(0, 0));}@@ -1156,6 +1161,7 @@ void hero_finished_entering_scene(bool set_hazard_marker) {/* ---------------------------------------------------------------- damage (TakeDamage, StartRecoil, Invulnerable) */#define RECOIL_VELOCITY 15.0f#define INVUL_TIME 1.3f+#define INVUL_TIME_STAL 1.75f /* (Stalwart Shell) */#define DAMAGE_FREEZE_DOWN 0.001f#define PULSE_DURATION 0.1f@@ -1232,7 +1238,7 @@ static void start_recoil(int side) {h->recoil_vx = h->recoil_vy = 0;set_state(HS_NO_INPUT);h->cs.recoil_frozen = true;- start_invulnerable(INVUL_TIME);+ start_invulnerable(charm_on(4) ? INVUL_TIME_STAL : INVUL_TIME);game_freeze_moment(); /* (then hero_recoil_unfreeze) */}@@ -1241,6 +1247,18 @@ void hero_recoil_unfreeze(void) {g_hero.cs.recoiling = true;}+/* TakeDamageCharmEffects: Grubsong's soul */+#define GRUB_SOUL_MP 15+static void add_mp_charge(int amount);+static void take_damage_charm_effects(int damage) {+ if (charm_on(3) && damage > 0) add_mp_charge(GRUB_SOUL_MP);+}++/* the Fury FSM (Charm Effects) as the Knight is hurt: Fury of the Fallen on at one mask (none of them lifeblood) */+static void fury_check(void) {+ if (!g_hero.fury) g_hero.fury = charm_on(6) && g_pd.health == 1;+}+/* PlayerData.TakeHealth: lifeblood first */static void take_health(int damage) {if (g_pd.health_blue > 0) {@@ -1263,7 +1281,9 @@ void hero_take_damage(int side, int damage, int hazard) {cancel_attack();if (h->cs.recoiling_left || h->cs.recoiling_right) cancel_recoil_horizontal();if (h->cs.bouncing) cancel_bounce(), h->body.vy = 0;- take_health(damage);+ take_health(pd_flag(PDF_OVERCHARMED) ? damage * 2 : damage);+ take_damage_charm_effects(damage);+ fury_check();if (g_pd.health == 0) {hero_die();return;@@ -1273,6 +1293,9 @@ void hero_take_damage(int side, int damage, int hazard) {} else if (h->cs.invulnerable && !h->cs.hazard_death && (hazard == HAZ_SPIKES || hazard == HAZ_ACID)) {/* (spikes and acid hurt even through invulnerability) */take_health(damage);+ take_damage_charm_effects(damage);+ vm_broadcast(VMEV_HERO_DAMAGED); /* (HeroCtrl-HeroDamaged) */+ fury_check();if (g_pd.health == 0) hero_die();else die_from_hazard();}@@ -1326,10 +1349,10 @@ void hero_face(bool right) {else face_left();}void hero_gravity(bool on) { affected_by_gravity(on); }-/* MaxHealth: whole again, the lifeblood gone (UpdateBlueHealth) */+/* MaxHealth: whole again, the lifeblood as the charms give it (UpdateBlueHealth: Lifeblood Heart's two) */void hero_max_health(void) {g_pd.health = g_pd.max_health;- g_pd.health_blue = 0;+ g_pd.health_blue = charm_on(8) ? 2 : 0;}/* ADD BLUE HEALTH (Blue Health Control) */@@ -1410,7 +1433,10 @@ static void add_mp_charge(int amount) {p->mp = (int16_t)(p->mp + amount);}-void hero_soul_gain(void) { add_mp_charge(g_pd.mp < g_pd.max_mp ? 11 : 6); }+void hero_soul_gain(void) {+ if (g_pd.mp < g_pd.max_mp) add_mp_charge(charm_on(20) ? 14 : 11); /* (Soul Catcher: more) */+ else add_mp_charge(charm_on(20) ? 8 : 6);+}void hero_add_mp_charge(int amount) { add_mp_charge(amount); }void hero_add_geo(int amount) { g_pd.geo += amount; }@@ -1444,8 +1470,8 @@ void hero_relinquish_control_not_velocity(void) {h->touching_wall_l = h->touching_wall_r = false;}-/* CharmUpdate: the Knight as his charms make him (charm effects: hero.c's own as they are read) */-void hero_charm_update(void) {}+/* CharmUpdate: the Knight as his charms make him, whole again (the other charms' effects: where they are read) */+void hero_charm_update(void) { hero_max_health(); }void hero_regain_control(void) {Hero *h = &g_hero;diff --git a/games/hollowknight/src/hk.h b/games/hollowknight/src/hk.hindex 2ea49090..f1bd3bc2 100644--- a/games/hollowknight/src/hk.h+++ b/games/hollowknight/src/hk.h@@ -156,6 +156,7 @@ bool anim_is_playing(const Anim *a, int clip);void anim_update(Anim *a, float dt);float clip_duration(int clip);int clip_frames_count(int clip);+int clip_frame_sprite(int clip, int frame);uint16_t to_f16(float f);void sprite_inst(int sprite, float x, float y, float z, float sx, float sy, uint8_t tint, Inst *out);void sprite_inst_rot(int sprite, float x, float y, float z, float sx, float sy, float degrees, uint8_t tint, Inst *out);diff --git a/games/hollowknight/src/obj.c b/games/hollowknight/src/obj.cindex c1a3cd1a..d3debc8d 100644--- a/games/hollowknight/src/obj.c+++ b/games/hollowknight/src/obj.c@@ -846,7 +846,8 @@ void obj_swing_start(void) {/* the slash's shape this step (world, convex): what it touches is hit (once a swing), the direction (degrees) the* blow goes; -> what the Knight does (HB_*: bounce, recoil) */int obj_nail(const float *pts, int npts, float direction) {- int out = enemies_nail(pts, npts, direction, g_pd.nail_damage);+ /* (damages_enemy: the nail's damage, at its Multiplier; Fury's 1.75) */+ int out = enemies_nail(pts, npts, direction, g_hero.fury ? (int)rintf(g_pd.nail_damage * 1.75f) : g_pd.nail_damage);for (int k = 0; k < nobjs; k++) {Obj *o = &objs[k];const Ent *e = ent_at(o->ent);diff --git a/games/hollowknight/src/spell.c b/games/hollowknight/src/spell.cindex 310ad952..ee8bbab2 100644--- a/games/hollowknight/src/spell.c+++ b/games/hollowknight/src/spell.c@@ -5,7 +5,8 @@#define DT 0.02f#define BUTTON_DOWN_TIME 0.25f#define FOCUS_START_TIME 0.25f-#define TIME_PER_MP_DRAIN 0.027f /* (Time Per MP Drain UnCH: no charm) */+#define TIME_PER_MP_DRAIN 0.027f /* (Time Per MP Drain UnCH: no charm) */+#define TIME_PER_MP_DRAIN_CH 0.018f /* (Time Per MP Drain CH: Quick Focus) */#define GRACE_TIME 0.45f#define MP_COST 33@@ -23,7 +24,7 @@ static struct {int start_mp;/* (HeroController's MP drain) */bool drain;- float drain_timer;+ float drain_timer, drain_time;int drained;} sp;@@ -37,7 +38,11 @@ void spell_reset(void) {}/* StartMPDrain, StopMPDrain; the drain itself is HeroController.Update's */-static void drain_start(void) { sp.drain = true, sp.drain_timer = 0, sp.drained = 0; }+/* (StartMPDrain, at the Time Per MP Drain that Set Focus Speed chose) */+static void drain_start(void) {+ sp.drain = true, sp.drain_timer = 0, sp.drained = 0;+ sp.drain_time = charm_on(7) ? TIME_PER_MP_DRAIN_CH : TIME_PER_MP_DRAIN;+}static void focus_end_common(void) {sp.drain = false;@@ -95,9 +100,9 @@ void spell_update(void) {/* HeroController.Update's MP drain */if (sp.drain) {sp.drain_timer += DT;- while (sp.drain_timer >= TIME_PER_MP_DRAIN) {+ while (sp.drain_timer >= sp.drain_time) {sp.drained++;- sp.drain_timer -= TIME_PER_MP_DRAIN;+ sp.drain_timer -= sp.drain_time;if (g_pd.mp > 0) g_pd.mp--;if (sp.drained == MP_COST && sp.state == SP_FOCUS) {/* FOCUS COMPLETED: Spore Cloud, Set HP Amount, Focus Heal */@@ -236,16 +241,17 @@ void spell_cast(bool up, bool down) {/* ---------------------------------------------------------------- Vengeful Spirit (Fireball Top, Fireball) */#define MAX_FIREBALLS 2#define FIRE_SPEED 40.0f-#define FB_SX 1.3f /* (Set Damage: its scale) */+#define FB_SX 1.3f /* (Set Damage: its scale with Shaman Stone; 1 without) */#define FB_SY 1.6f#define FB_DAMAGE 15+#define FB_DAMAGE_SHAMAN 20#define FB_MAGNITUDE 1.5f /* (damages_enemy: magnitudeMult) */enum { FB_OFF, FB_PAUSE, FB_IDLE, FB_DISSIPATE, FB_GONE, FB_WALL };typedef struct {uint8_t st;bool right;- float t;+ float t, sx, sy; /* (its scale) */Body body; /* (its Terrain Checker's box: what stops it) */Anim anim, blast, impact;float bx, by; /* the blast's place (Fireball Top's child) */@@ -266,6 +272,7 @@ static void fireball_spawn(void) {}const Hero *h = &g_hero;memset(f, 0, sizeof *f);+ f->sx = charm_on(19) ? FB_SX : 1, f->sy = charm_on(19) ? FB_SY : 1; /* (Set Damage) *//* Fireball Top, at the Knight: its blast ahead of him, the camera shaken, the fireball sent off */f->right = h->cs.facing_right;float k = f->right ? 1.0f : -1.0f;@@ -277,7 +284,7 @@ static void fireball_spawn(void) {b->x = h->body.x + 1.1683f * k, b->y = h->body.y - 0.5428f;b->vx = FIRE_SPEED * k;/* (the Terrain Checker's box, at the fireball's scale) */- b->ox = 0.513f * k, b->oy = -0.032f, b->hx = 0.887f, b->hy = 0.504f;+ b->ox = 0.3948f * f->sx * k, b->oy = -0.02f * f->sy, b->hx = 0.68255f * f->sx, b->hy = 0.315f * f->sy;b->mask = CF_TERRAIN;anim_play(&f->anim, CLIP_FIREBALL_BALL);f->st = FB_PAUSE;@@ -285,10 +292,11 @@ static void fireball_spawn(void) {static void fireball_hit_things(Fireball *f) {/* (its trigger box: 2.61 x 2.12 about (0.53, -0.02), at its scale) */- float k = f->right ? 1.0f : -1.0f, cx = f->body.x + 0.5344f * FB_SX * k, cy = f->body.y - 0.0179f * FB_SY;- float hx = 2.6111f / 2 * FB_SX, hy = 2.1246f / 2 * FB_SY;+ float k = f->right ? 1.0f : -1.0f, cx = f->body.x + 0.5344f * f->sx * k, cy = f->body.y - 0.0179f * f->sy;+ float hx = 2.6111f / 2 * f->sx, hy = 2.1246f / 2 * f->sy;float dir = f->right ? 0 : 180;- f->hit_enemies |= enemies_spell(cx - hx, cy - hy, cx + hx, cy + hy, dir, FB_DAMAGE, FB_MAGNITUDE, f->hit_enemies);+ int damage = f->sx > 1 ? FB_DAMAGE_SHAMAN : FB_DAMAGE;+ f->hit_enemies |= enemies_spell(cx - hx, cy - hy, cx + hx, cy + hy, dir, damage, FB_MAGNITUDE, f->hit_enemies);obj_spell(cx - hx, cy - hy, cx + hx, cy + hy, dir, f->hit_objs);vm_spell(cx - hx, cy - hy, cx + hx, cy + hy);}@@ -357,12 +365,12 @@ void fireballs_draw(void) {gfx_actor(&in, SORT_KEY(0, 0));}if (f->st == FB_PAUSE || f->st == FB_IDLE || f->st == FB_DISSIPATE) {- sprite_inst(f->anim.sprite, f->body.x, f->body.y, -0.002f, FB_SX * k, FB_SY, 0, &in);+ sprite_inst(f->anim.sprite, f->body.x, f->body.y, -0.002f, f->sx * k, f->sy, 0, &in);gfx_actor(&in, SORT_KEY(0, 0));}if (f->impact_on) {/* (Wall Impact: its child, 1.71 ahead, at 2.5 its scale) */- sprite_inst(f->impact.sprite, f->body.x + 1.7094f * FB_SX * k, f->body.y, -0.002f, 2.5f * FB_SX * k, 2.5f * FB_SY, 0, &in);+ sprite_inst(f->impact.sprite, f->body.x + 1.7094f * f->sx * k, f->body.y, -0.002f, 2.5f * f->sx * k, 2.5f * f->sy, 0, &in);gfx_actor(&in, SORT_KEY(0, 0));}}diff --git a/games/hollowknight/tests/play.c b/games/hollowknight/tests/play.cindex 6e805733..5f75b95a 100644--- a/games/hollowknight/tests/play.c+++ b/games/hollowknight/tests/play.c@@ -102,7 +102,12 @@ int main(int argc, char **argv) {dialogue_start(atoi(strchr(getenv("HKTALK"), ':') + 1));}if (getenv("HKKILL") && atoi(getenv("HKKILL")) == tick) hero_take_damage(SIDE_LEFT, 99, HAZ_NORMAL);- if (getenv("HKHURT") && atoi(getenv("HKHURT")) == tick) hero_take_damage(SIDE_LEFT, 1, HAZ_NORMAL);+ /* (HKFLING=tick: geo flung up, a way to the Knight's right) */+ if (getenv("HKFLING") && atoi(getenv("HKFLING")) == tick)+ geo_fling_at(1, 4, g_hero.body.x + 6, g_hero.body.y + 1, 8, 12, 60, 120, 0);+ /* (HKHURT=tick[:damage]) */+ if (getenv("HKHURT") && atoi(getenv("HKHURT")) == tick)+ hero_take_damage(SIDE_LEFT, strchr(getenv("HKHURT"), ':') ? atoi(strchr(getenv("HKHURT"), ':') + 1) : 1, HAZ_NORMAL);/* (HKREENTER=tick: the room entered again then, as it was left) */if (getenv("HKREENTER") && atoi(getenv("HKREENTER")) == tick) game_enter(id, px, py, true);if (getenv("HKGOD")) g_pd.health = g_pd.max_health;@@ -173,8 +178,9 @@ int main(int argc, char **argv) {if (pd_flag(i)) printf(" %d", i);int np = 0;for (int i = 0; i < MAX_PERSIST; i++) np += persist_get(i);- printf(" hornet_greenpath %d trinkets %d %d %d %d charms %d saved %d\n", g_pd.hornet_greenpath, g_pd.trinkets[0],- g_pd.trinkets[1], g_pd.trinkets[2], g_pd.trinkets[3], g_pd.charms_owned, np);+ printf(" hornet_greenpath %d trinkets %d %d %d %d charms %d saved %d health %d+%d mp %d geo %d\n", g_pd.hornet_greenpath,+ g_pd.trinkets[0], g_pd.trinkets[1], g_pd.trinkets[2], g_pd.trinkets[3], g_pd.charms_owned, np, g_pd.health,+ g_pd.health_blue, g_pd.mp, (int)g_pd.geo);}return 0;}diff --git a/games/hollowknight/tools/actors.py b/games/hollowknight/tools/actors.pyindex bc9c569a..bfe29641 100644--- a/games/hollowknight/tools/actors.py+++ b/games/hollowknight/tools/actors.py@@ -10,7 +10,8 @@ import unity, tk2d, scene, art, textKNIGHT = ("resources.assets", 20600, ["Idle", "Idle Hurt", "Idle Wind", "Run", "Run To Idle", "Walk", "Turn", "TurnToIdle", "Airborne", "Fall", "Land","HardLand", "Dash", "Dash To Idle", "Dash Effect", "Slash", "SlashAlt", "UpSlash", "DownSlash", "SlashEffect",- "SlashEffectAlt", "UpSlashEffect", "DownSlashEffect", "LookUp", "LookUpEnd", "LookUpToIdle", "LookDown",+ "SlashEffectAlt", "UpSlashEffect", "DownSlashEffect", "SlashEffect F", "SlashEffectAlt F", "UpSlashEffect F",+ "DownSlashEffect F", "LookUp", "LookUpEnd", "LookUpToIdle", "LookDown","LookDownEnd", "LookDownToIdle", "Recoil", "Stun", "Death", "Death Head Normal", "Spike Death","Spike Death Antic", "Hazard Respawn", "Respawn Wake", "Focus", "Focus Get", "Focus Get Once", "Focus End","Fireball Antic", "Fireball1 Cast", "Sit", "Sit Lean", "Sit Idle", "Sitting Asleep", "Sit Fall Asleep", "Wake",@@ -135,6 +136,8 @@ ACTORS = {"knight": KNIGHT,"Coin Get", "Soul Burst"]),"liquid": ("resources.assets", 20843, None),"geo": ("resources.assets", 23266, ["Small Idle", "Small Air", "Med Idle", "Med Air", "Large Idle", "Large Air"]),+ # (Gathering Swarm: the bug that brings geo, a child of each)+ "geobug": ("resources.assets", 22564, ["Lamp_Bug_idle"]),# the dialogue box (on the HUD, a third bigger with its text) and the prompt markers"dialogue": ("resources.assets", 20724, ["Arrow Up", "Arrow Down", "Stop Up", "Stop Down", "Fleur Top Up","Fleur Top Down", "Fleur Bot Up", "Fleur Bot Down", "Dream Up", "Dream Down"]),@@ -210,8 +213,9 @@ def named_sprites(sprites):return out# 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,"Blast": 1.4, "Ball": 1.45, "Ball End": 1.45, "Fireball Wall Impact": 2.0,- "Small Idle": 1.5, "Small Air": 1.5, "Med Idle": 1.5, "Med Air": 1.5, "Large Idle": 1.5, "Large Air": 1.5}+ "Lamp_Bug_idle": 1.5 * 1.4838, "Small Idle": 1.5, "Small Air": 1.5, "Med Idle": 1.5, "Med Air": 1.5, "Large Idle": 1.5, "Large Air": 1.5}K0 = scene.FOCAL / (0.004 - scene.CAMZ) # screen pixels a unit, where actors are (z near 0)HUD_K = (scene.VIEW_H / 2) / 8.7107 # the HUD's (its orthographic camera)# (actor, clip): drawn bigger or smaller than their spritesdiff --git a/games/hollowknight/tools/vm.py b/games/hollowknight/tools/vm.pyindex 21a00e13..9a1e858d 100644--- a/games/hollowknight/tools/vm.py+++ b/games/hollowknight/tools/vm.py@@ -55,7 +55,7 @@ PD_CONST = {"backerCredits": False, "equippedCharm_10": False, "elderbugGaveFlow"visitedCrossroadsInfected": False, "defeatedNightmareGrimm": False, "jijiDoorUnlocked": False,"visitedCliffs": False, "mineLiftOpened": False, "brettaRescued": False, "elderbugHistory2": False,"shamanFireball2Convo": False, "shamanScreamConvo": False, "shamanScream2Convo": False,- "shamanQuakeConvo": False, "shamanQuake2Convo": False, "hasDreamNail": False, "equippedCharm_19": False,+ "shamanQuakeConvo": False, "shamanQuake2Convo": False, "hasDreamNail": False,"equippedCharm_11": False, "dungDefenderEncounterReady": False, "elderbugSpeechBretta": False,"elderbugSpeechJiji": False, "elderbugSpeechKingsPass": False, "elderbugSpeechMinesLift": False,"elderbugSpeechInfectedCrossroads": False, "elderbugSpeechFinalBossDoor": False, "hasDoubleJump": False,