From 4d4d7e554def50e5fdbc04a5d2a78f3a69a76327 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Wed, 13 Jan 2021 18:54:54 +0000 Subject: More misc attack animations --- src/constants/animation_constants.asm | 8 +- src/constants/attack_animation_constants.asm | 290 +++++++++++++-------------- 2 files changed, 149 insertions(+), 149 deletions(-) (limited to 'src/constants') diff --git a/src/constants/animation_constants.asm b/src/constants/animation_constants.asm index 8b0ba37..44faa75 100644 --- a/src/constants/animation_constants.asm +++ b/src/constants/animation_constants.asm @@ -17,9 +17,9 @@ ; Normal animations const DUEL_ANIM_NONE ; $00 const DUEL_ANIM_GLOW ; $01 - const DUEL_ANIM_2 ; $02 + const DUEL_ANIM_PARALYSIS ; $02 const DUEL_ANIM_SLEEP ; $03 - const DUEL_ANIM_4 ; $04 + const DUEL_ANIM_CONFUSION ; $04 const DUEL_ANIM_POISON ; $05 const DUEL_ANIM_6 ; $06 const DUEL_ANIM_HIT ; $07 @@ -32,14 +32,14 @@ const DUEL_ANIM_SMALL_FLAME ; $0e const DUEL_ANIM_BIG_FLAME ; $0f const DUEL_ANIM_FIRE_SPIN ; $10 - const DUEL_ANIM_17 ; $11 + const DUEL_ANIM_DIVE_BOMB ; $11 const DUEL_ANIM_WATER_JETS ; $12 const DUEL_ANIM_WATER_GUN ; $13 const DUEL_ANIM_WHIRLPOOL ; $14 const DUEL_ANIM_HYDRO_PUMP ; $15 const DUEL_ANIM_BLIZZARD ; $16 const DUEL_ANIM_PSYCHIC ; $17 - const DUEL_ANIM_24 ; $18 + const DUEL_ANIM_GLARE ; $18 const DUEL_ANIM_BEAM ; $19 const DUEL_ANIM_HYPER_BEAM ; $1a const DUEL_ANIM_ROCK_THROW ; $1b diff --git a/src/constants/attack_animation_constants.asm b/src/constants/attack_animation_constants.asm index d3e72c0..3f1f113 100644 --- a/src/constants/attack_animation_constants.asm +++ b/src/constants/attack_animation_constants.asm @@ -2,148 +2,148 @@ ; these map to a sequence of duel animations ; (see src\data\attack_animations.asm) const_def - const ATK_ANIM_NONE ; $00 - const ATK_ANIM_HIT ; $01 - const ATK_ANIM_BIG_HIT ; $02 - const ATK_ANIM_3 ; $03 - const ATK_ANIM_HIT_RECOIL ; $04 - const ATK_ANIM_HIT_EFFECT ; $05 - const ATK_ANIM_THUNDERSHOCK ; $06 - const ATK_ANIM_THUNDER ; $07 - const ATK_ANIM_THUNDERBOLT ; $08 - const ATK_ANIM_9 ; $09 - const ATK_ANIM_THUNDER_WHOLE_SCREEN ; $0a - const ATK_ANIM_11 ; $0b - const ATK_ANIM_THUNDERSTORM ; $0c - const ATK_ANIM_CHAIN_LIGHTNING ; $0d - const ATK_ANIM_SMALL_FLAME ; $0e - const ATK_ANIM_BIG_FLAME ; $0f - const ATK_ANIM_FIRE_SPIN ; $10 - const ATK_ANIM_17 ; $11 - const ATK_ANIM_WATER_JETS ; $12 - const ATK_ANIM_WATER_GUN ; $13 - const ATK_ANIM_WHIRLPOOL ; $14 - const ATK_ANIM_DRAGON_RAGE ; $15 - const ATK_ANIM_HYDRO_PUMP ; $16 - const ATK_ANIM_23 ; $17 - const ATK_ANIM_BLIZZARD ; $18 - const ATK_ANIM_PSYCHIC_HIT ; $19 - const ATK_ANIM_NIGHTMARE ; $1a - const ATK_ANIM_27 ; $1b - const ATK_ANIM_DARK_MIND ; $1c - const ATK_ANIM_BEAM ; $1d - const ATK_ANIM_HYPER_BEAM ; $1e - const ATK_ANIM_31 ; $1f - const ATK_ANIM_ROCK_THROW ; $20 - const ATK_ANIM_STONE_BARRAGE ; $21 - const ATK_ANIM_PUNCH ; $22 - const ATK_ANIM_THUNDERPUNCH ; $23 - const ATK_ANIM_FIRE_PUNCH ; $24 - const ATK_ANIM_STRETCH_KICK ; $25 - const ATK_ANIM_SLASH ; $26 - const ATK_ANIM_WHIP ; $27 - const ATK_ANIM_TEAR ; $28 - const ATK_ANIM_MULTIPLE_SLASH ; $29 - const ATK_ANIM_42 ; $2a - const ATK_ANIM_RAMPAGE ; $2b - const ATK_ANIM_DRILL ; $2c - const ATK_ANIM_POT_SMASH ; $2d - const ATK_ANIM_BONEMERANG ; $2e - const ATK_ANIM_SEISMIC_TOSS ; $2f - const ATK_ANIM_NEEDLES ; $30 - const ATK_ANIM_49 ; $31 - const ATK_ANIM_SMOG ; $32 - const ATK_ANIM_51 ; $33 - const ATK_ANIM_52 ; $34 - const ATK_ANIM_FOUL_GAS ; $35 - const ATK_ANIM_FOUL_ODOR ; $36 - const ATK_ANIM_POWDER_EFFECT_CHANCE ; $37 - const ATK_ANIM_POWDER_HIT_POISON ; $38 - const ATK_ANIM_POISON_POWDER ; $39 - const ATK_ANIM_58 ; $3a - const ATK_ANIM_59 ; $3b - const ATK_ANIM_60 ; $3c - const ATK_ANIM_GOO ; $3d - const ATK_ANIM_62 ; $3e - const ATK_ANIM_SPIT_POISON ; $3f - const ATK_ANIM_64 ; $40 - const ATK_ANIM_BUBBLES ; $41 - const ATK_ANIM_66 ; $42 - const ATK_ANIM_STRING_SHOT ; $43 - const ATK_ANIM_68 ; $44 - const ATK_ANIM_BOYFRIENDS ; $45 - const ATK_ANIM_LURE ; $46 - const ATK_ANIM_TOXIC ; $47 - const ATK_ANIM_CONFUSE_RAY ; $48 - const ATK_ANIM_73 ; $49 - const ATK_ANIM_SING ; $4a - const ATK_ANIM_LULLABY ; $4b - const ATK_ANIM_SUPERSONIC ; $4c - const ATK_ANIM_77 ; $4d - const ATK_ANIM_PETAL_DANCE ; $4e - const ATK_ANIM_PROTECT ; $4f - const ATK_ANIM_BARRIER ; $50 - const ATK_ANIM_QUICK_ATTACK ; $51 - const ATK_ANIM_82 ; $52 - const ATK_ANIM_WHIRLWIND ; $53 - const ATK_ANIM_CRY ; $54 - const ATK_ANIM_AMNESIA ; $55 - const ATK_ANIM_SELFDESTRUCT ; $56 - const ATK_ANIM_BIG_SELFDESTRUCTION ; $57 - const ATK_ANIM_RECOVER ; $58 - const ATK_ANIM_DRAIN ; $59 - const ATK_ANIM_DARK_GAS ; $5a - const ATK_ANIM_GLOW_EFFECT ; $5b - const ATK_ANIM_MIRROR_MOVE ; $5c - const ATK_ANIM_93 ; $5d - const ATK_ANIM_PKMN_POWER_1 ; $5e - const ATK_ANIM_FIREGIVER ; $5f - const ATK_ANIM_QUICKFREEZE ; $60 - const ATK_ANIM_PEAL_OF_THUNDER ; $61 - const ATK_ANIM_HEALING_WIND ; $62 - const ATK_ANIM_WHIRLWIND_ZIGZAG ; $63 - const ATK_ANIM_BIG_THUNDER ; $64 - const ATK_ANIM_SOLAR_POWER ; $65 - const ATK_ANIM_POISON_FANG ; $66 - const ATK_ANIM_103 ; $67 - const ATK_ANIM_104 ; $68 - const ATK_ANIM_105 ; $69 - const ATK_ANIM_106 ; $6a - const ATK_ANIM_107 ; $6b - const ATK_ANIM_CAT_PUNCH ; $6c - const ATK_ANIM_MAGNETIC_STORM ; $6d - const ATK_ANIM_POISON_WHIP ; $6e - const ATK_ANIM_THUNDER_WAVE ; $6f - const ATK_ANIM_112 ; $70 - const ATK_ANIM_SPORE ; $71 - const ATK_ANIM_HYPNOSIS ; $72 - const ATK_ANIM_ENERGY_CONVERSION ; $73 - const ATK_ANIM_116 ; $74 - const ATK_ANIM_117 ; $75 - const ATK_ANIM_118 ; $76 - const ATK_ANIM_119 ; $77 - const ATK_ANIM_120 ; $78 - const ATK_ANIM_121 ; $79 - const ATK_ANIM_122 ; $7a - const ATK_ANIM_123 ; $7b - const ATK_ANIM_124 ; $7c - const ATK_ANIM_125 ; $7d - const ATK_ANIM_126 ; $7e - const ATK_ANIM_127 ; $7f - const ATK_ANIM_SLEEPING_GAS ; $80 - const ATK_ANIM_129 ; $81 - const ATK_ANIM_130 ; $82 - const ATK_ANIM_131 ; $83 - const ATK_ANIM_132 ; $84 - const ATK_ANIM_133 ; $85 - const ATK_ANIM_134 ; $86 - const ATK_ANIM_135 ; $87 - const ATK_ANIM_EXPAND ; $88 - const ATK_ANIM_137 ; $89 - const ATK_ANIM_138 ; $8a - const ATK_ANIM_139 ; $8b - const ATK_ANIM_140 ; $8c - const ATK_ANIM_141 ; $8d - const ATK_ANIM_142 ; $8e - const ATK_ANIM_143 ; $8f - const ATK_ANIM_144 ; $90 + const ATK_ANIM_NONE ; $00 + const ATK_ANIM_HIT ; $01 + const ATK_ANIM_BIG_HIT ; $02 + const ATK_ANIM_3 ; $03 + const ATK_ANIM_HIT_RECOIL ; $04 + const ATK_ANIM_HIT_EFFECT ; $05 + const ATK_ANIM_THUNDERSHOCK ; $06 + const ATK_ANIM_THUNDER ; $07 + const ATK_ANIM_THUNDERBOLT ; $08 + const ATK_ANIM_9 ; $09 + const ATK_ANIM_THUNDER_WHOLE_SCREEN ; $0a + const ATK_ANIM_11 ; $0b + const ATK_ANIM_THUNDERSTORM ; $0c + const ATK_ANIM_CHAIN_LIGHTNING ; $0d + const ATK_ANIM_SMALL_FLAME ; $0e + const ATK_ANIM_BIG_FLAME ; $0f + const ATK_ANIM_FIRE_SPIN ; $10 + const ATK_ANIM_DIVE_BOMB ; $11 + const ATK_ANIM_WATER_JETS ; $12 + const ATK_ANIM_WATER_GUN ; $13 + const ATK_ANIM_WHIRLPOOL ; $14 + const ATK_ANIM_DRAGON_RAGE ; $15 + const ATK_ANIM_HYDRO_PUMP ; $16 + const ATK_ANIM_23 ; $17 + const ATK_ANIM_BLIZZARD ; $18 + const ATK_ANIM_PSYCHIC_HIT ; $19 + const ATK_ANIM_NIGHTMARE ; $1a + const ATK_ANIM_27 ; $1b + const ATK_ANIM_DARK_MIND ; $1c + const ATK_ANIM_BEAM ; $1d + const ATK_ANIM_HYPER_BEAM ; $1e + const ATK_ANIM_31 ; $1f + const ATK_ANIM_ROCK_THROW ; $20 + const ATK_ANIM_STONE_BARRAGE ; $21 + const ATK_ANIM_PUNCH ; $22 + const ATK_ANIM_THUNDERPUNCH ; $23 + const ATK_ANIM_FIRE_PUNCH ; $24 + const ATK_ANIM_STRETCH_KICK ; $25 + const ATK_ANIM_SLASH ; $26 + const ATK_ANIM_WHIP ; $27 + const ATK_ANIM_TEAR ; $28 + const ATK_ANIM_MULTIPLE_SLASH ; $29 + const ATK_ANIM_42 ; $2a + const ATK_ANIM_RAMPAGE ; $2b + const ATK_ANIM_DRILL ; $2c + const ATK_ANIM_POT_SMASH ; $2d + const ATK_ANIM_BONEMERANG ; $2e + const ATK_ANIM_SEISMIC_TOSS ; $2f + const ATK_ANIM_NEEDLES ; $30 + const ATK_ANIM_49 ; $31 + const ATK_ANIM_SMOG ; $32 + const ATK_ANIM_51 ; $33 + const ATK_ANIM_52 ; $34 + const ATK_ANIM_FOUL_GAS ; $35 + const ATK_ANIM_FOUL_ODOR ; $36 + const ATK_ANIM_POWDER_EFFECT_CHANCE ; $37 + const ATK_ANIM_POWDER_HIT_POISON ; $38 + const ATK_ANIM_POISON_POWDER ; $39 + const ATK_ANIM_58 ; $3a + const ATK_ANIM_59 ; $3b + const ATK_ANIM_60 ; $3c + const ATK_ANIM_GOO ; $3d + const ATK_ANIM_62 ; $3e + const ATK_ANIM_SPIT_POISON ; $3f + const ATK_ANIM_64 ; $40 + const ATK_ANIM_BUBBLES ; $41 + const ATK_ANIM_66 ; $42 + const ATK_ANIM_STRING_SHOT ; $43 + const ATK_ANIM_68 ; $44 + const ATK_ANIM_BOYFRIENDS ; $45 + const ATK_ANIM_LURE ; $46 + const ATK_ANIM_TOXIC ; $47 + const ATK_ANIM_CONFUSE_RAY ; $48 + const ATK_ANIM_73 ; $49 + const ATK_ANIM_SING ; $4a + const ATK_ANIM_LULLABY ; $4b + const ATK_ANIM_SUPERSONIC ; $4c + const ATK_ANIM_77 ; $4d + const ATK_ANIM_PETAL_DANCE ; $4e + const ATK_ANIM_PROTECT ; $4f + const ATK_ANIM_BARRIER ; $50 + const ATK_ANIM_QUICK_ATTACK ; $51 + const ATK_ANIM_AGILITY_PROTECT ; $52 + const ATK_ANIM_WHIRLWIND ; $53 + const ATK_ANIM_CRY ; $54 + const ATK_ANIM_AMNESIA ; $55 + const ATK_ANIM_SELFDESTRUCT ; $56 + const ATK_ANIM_BIG_SELFDESTRUCTION ; $57 + const ATK_ANIM_RECOVER ; $58 + const ATK_ANIM_DRAIN ; $59 + const ATK_ANIM_DARK_GAS ; $5a + const ATK_ANIM_GLOW_EFFECT ; $5b + const ATK_ANIM_MIRROR_MOVE ; $5c + const ATK_ANIM_DEVOLUTION_BEAM ; $5d + const ATK_ANIM_PKMN_POWER_1 ; $5e + const ATK_ANIM_FIREGIVER ; $5f + const ATK_ANIM_QUICKFREEZE ; $60 + const ATK_ANIM_PEAL_OF_THUNDER ; $61 + const ATK_ANIM_HEALING_WIND ; $62 + const ATK_ANIM_WHIRLWIND_ZIGZAG ; $63 + const ATK_ANIM_BIG_THUNDER ; $64 + const ATK_ANIM_SOLAR_POWER ; $65 + const ATK_ANIM_POISON_FANG ; $66 + const ATK_ANIM_103 ; $67 + const ATK_ANIM_104 ; $68 + const ATK_ANIM_105 ; $69 + const ATK_ANIM_FRIENDSHIP_SONG ; $6a + const ATK_ANIM_SCRUNCH ; $6b + const ATK_ANIM_CAT_PUNCH ; $6c + const ATK_ANIM_MAGNETIC_STORM ; $6d + const ATK_ANIM_POISON_WHIP ; $6e + const ATK_ANIM_THUNDER_WAVE ; $6f + const ATK_ANIM_112 ; $70 + const ATK_ANIM_SPORE ; $71 + const ATK_ANIM_HYPNOSIS ; $72 + const ATK_ANIM_ENERGY_CONVERSION ; $73 + const ATK_ANIM_LEER ; $74 + const ATK_ANIM_CONFUSION_HIT ; $75 + const ATK_ANIM_118 ; $76 + const ATK_ANIM_119 ; $77 + const ATK_ANIM_BENCH_HIT ; $78 + const ATK_ANIM_HEAL ; $79 + const ATK_ANIM_RECOIL_HIT ; $7a + const ATK_ANIM_POISON ; $7b + const ATK_ANIM_CONFUSION ; $7c + const ATK_ANIM_PARALYSIS ; $7d + const ATK_ANIM_SLEEP ; $7e + const ATK_ANIM_IMAKUNI_CONFUSION ; $7f + const ATK_ANIM_SLEEPING_GAS ; $80 + const ATK_ANIM_129 ; $81 + const ATK_ANIM_THUNDER_PLAY_AREA ; $82 + const ATK_ANIM_CAT_PUNCH_PLAY_AREA ; $83 + const ATK_ANIM_FIREGIVER_PLAYER ; $84 + const ATK_ANIM_FIREGIVER_OPP ; $85 + const ATK_ANIM_HEALING_WIND_PLAY_AREA ; $86 + const ATK_ANIM_GALE ; $87 + const ATK_ANIM_EXPAND ; $88 + const ATK_ANIM_137 ; $89 + const ATK_ANIM_FULL_HEAL ; $8a + const ATK_ANIM_139 ; $8b + const ATK_ANIM_SPIT_POISON_SUCCESS ; $8c + const ATK_ANIM_GUST_OF_WIND ; $8d + const ATK_ANIM_HEAL_BOTH_SIDES ; $8e + const ATK_ANIM_143 ; $8f + const ATK_ANIM_144 ; $90 -- cgit v1.2.3